Ruby 2.1 working.
Ruby 2.1 not quite working.
Merge branch 'master' into Ruby-2.1.1

Conflicts:
	Gemfile
	Gemfile.lock
	config/routes.rb
Basic Ruby 2.1.1 up, running, tests passing
Ruby 2.1.1 Upgrade Complete, tests passing, and Rails 4 Devise bug fixed as well
Updated Travis yml to Ruby 2.1.1
Merge pull request #283 from kimardenmiller/Ruby-2.1.1

Ruby 2.1.1
Merge branch 'master' into notifications