Merge pull request #154 from TheWeatherCompany/develop

white space and formatting fixes