applying jquave's fixes to get it working with Spree 1.1.0beta
Update to fix beta in gemspec
More fun with twiddle wakkas and beta defs
Starting to work through breaking tests - switched out metasearch for ransack
Got it working on 1.1 :) Lots more to do: tests on products, tweaks etc
Try and fix asset pipeline stuff
Change states dynamic js call to basic script tag
update readme and versionfile [ci skip]
Merge remote-tracking branch 'citrus/master' for 1-1 support

Conflicts:
	app/overrides/admin/admin-wholesale-tab.rb
	app/views/spree/admin/variants/_form.html.erb
	app/views/spree/admin/wholesalers/_form.html.erb
	app/views/spree/checkout/_summary.html.erb
	app/views/spree/orders/show.html.erb
	app/views/spree/wholesalers/_fields.html.erb