removes heroku because rubyzip is a pain
Merge branch 'master' into enterprise