Merge pull request #154 from TheWeatherCompany/develop

white space and formatting fixes
Merge pull request #56 from greese/develop

Merge pull request #154 from TheWeatherCompany/develop