Re-added some of the stuff that was in the Gemfile earlier