Prevent duplicate copies of product images displaying, ensure correct columns are displayed
Merge git://github.com/spree/spree