Added config dummy
Merge branch 'heroku'
Undid all the stupid changes