settings stuff
Merge branch 'master' of heroku.com:nairobigram
temporary connection fix