Fix Ruby 1.8 syntax incompatibility within Spree::Api::BaseController
Remove commented out factory from payment_factory
Add field for attachment_url preference to image settings page

Fixes #2344
Remove commented out lines from payment factory
Bump ActiveMerchant dependency.

Fixes #2346
use ruby 1.8 hash syntax
Merge git://github.com/spree/spree