Refactor .travis.yml

Conflicts:

	.travis.yml
Add missing equal sign for admin_shipping_method_form_availability_fields

Fixes #2310
Updates Rails to 3.2.11 for security updates
Bump rails version in README [ci skip]
Stringify api_key

Fixes #2492
Use a string comparsion for locale parameters
Restrict Money dependency to 5.0.0
Version bump (1.1.5)
Version bump (1.1.6.beta)
Bump rails to 3.2.12
Ensure json gem version is at least 1.5.5 [Thanks to Steve Root for
notifying us of this]

Conflicts:
	core/spree_core.gemspec
Remove Mass Assignment of Role IDs
Thanks to Laurens Nienhaus for reporting
Version bump (1.1.6)
Version bump (1.1.7.beta)
Freeze to jquery-rails 2.1.4 as jQuery 1.9 breaks a plugin

This port the commit 3e476ba5a07ed0aea0e68b361814269b3b5e4109 from branch 1-2-stable.

Fixes #2646
Fix user autocomplete for admin orders.

Fixes #2655
Update activemerchant to requiring at least 1.31.x + ransack to 0.7.2

Fixes #2661
Bump rails to 3.2.13
Fix Spree.translations corruption of I18n cache

Fixes #2711
Mailers now require a from address, so we need to give defaults, using MailMethod.current