Merge branch 'dev'
Add some Heroku deploy tasks based on the Rakefile from http://goo.gl/SIU8b
Merge branch 'master' into dev