Update Vagrant to Ruby 2.1.1
Update Vagrant to RubyGems 2.2.2
Clean up Vagrantfile
Break merge into helper methods
Fix #153; allow merging ActiveModel errors
Configure Travis to use Ruby 2.1.1
Merge branch 'ruby-2-1-1'
Pin RubyGems version at 2.2.2