Upgrade to 2-2-stable

I've made changes so spree_contact_us works with 2-2-stable. Mainly changes to the assets locations. I've had to pass taxonomies as the sidebar expects it, and merge the erb eval as deface couldn't find enclosing end for the sidebar eval (gets confused with the inside end for some reason)