refactoring
Further refactoring
GlobalSettings work
Merging refactoring changes

Merge branch 'master' of https://github.com/localwarming-mit/local-warming