Roll Heroku breaking changes in #426 back to #416#431

reconstructions wants to merge 2 commits intoshakacode:mastershakacode/react-webpack-rails-tutorial:masterfrom

reconstructions:heroku_patchreconstructions/react-webpack-rails-tutorial:heroku_patchCopy head branch name to clipboard