Merge pull request #421 from iconmaster5326/master

trailing-whitespace: add option for custom chars to strip