Heroku final

Going to merge all of the Heroku stuff into Master. @pkchu has tested it.