Updates to make code decoupled from devise.

Conflicts:
	Gemfile
Fix user references to spree_user.