Removed a lot of nesting from config parsing
Merge branch 'master' into heroku