Added slightly more elaborate heroku instructions
Merge remote-tracking branch 'upstream/master'