Trim some whitespace
Merge branch 'master' of https://github.com/railstutorial/sample_app_2nd_ed