Merge pull request #235 from stevepiercy/master

79-columns, removing trailing white space on lines