Tidy gems

Consolidates our gem dependencies into the gemspec. Was there a reason some were added to the Gemfile?