Shuffled around settings to make heroku deploy easier