removed some bad setting
Merge branch 'scrutinizer-testing' of github.com:joetannenbaum/climate into scrutinizer-testing