Closer to Spree 2.1.2 compatibiliy

Works well, except for the links on the Supplier view.  I included a todo next to the broken links.
Notice the bumped version of friendly_id.