white-space cleanse, and added forin flags to a couple files that need to be looked at at a later date.
Merge pull request #425 from rashidkpc/master

Fixing silly conflict
Merge remote-tracking branch 'spencer/shared-config' into jshint
Closes #426