Merge in updates from heroku
Merge pull request #1 from chloeandisabel/dmg/update-ruby-2-1

Merge in updates from heroku