add more logic to outstancing balance and order updater to set the correct payment_state on the order when the order is canceled.

Fixes #5106
Closes #5193
Use rspec-retry to get past random phantomjs failures (turn off by default)

Closes #5178

Conflicts:
	common_spree_dependencies.rb
fix ignore_types to work with FlashHash in rails 4.1
Fixes #5192
Add track_inventory to permitted attributes.