Gemfile changes to appease the Heroku Gods
Merged bootstrap overrides from Chris' hack file.
Merge branch 'master' of github.com:crertel/beta