Update to Ruby 2.1.1
Bundle update all
Remove test until we put together a test suite
Merge branch 'master' into pwpush.com

Conflicts:
	Gemfile.lock