Added the heroku stuff
Merge with develop