Add 1.8.7 support back to Travis
Bump Rails to 3.2.11
[api] Convert 1.9 hash syntax to hashrocket syntax within inventory_units
controller

Fixes #2398

Fixes #2400
Bump rspec-rails dependency to 2.12.0
Bumping Rails Version in README to 3.2.11

Conflicts:

	README.md
Merge git://github.com/spree/spree