Update to the latest Rails
Use new terminology for credentials
Merge branch 'master' into offsite

Conflicts:
	Gemfile.lock
	app/models/spreedly_core.rb
	app/views/tshirts/_hidden_form_fields.html.erb