Fixes Guard configuration
Bumps gems
Fixes RSpec depreactions
Merge branch 'master' into update-gems

Conflicts:
	spec/spec_helper.rb
Merge pull request #8 from HouseTrip/update-gems

Updates gems