re-fixing heroku bootstrap
Merge branch 'master' of github.com:kyle-dorman/crowdcontrol

yes pleaseeee