Update gems so bundling works again
Merge branch 'fix-bitrot' into heroku-button