Updated addresses scope for user model.
Played with getting tests running. Can at least run 'rake spec'.
Updated routes to work with latest 2-1-stable branch.
Merge branch '2-1-stable' of github.com:onedanshow/spree_address_book into 2-1-stable

Conflicts:
	Gemfile
	spree_address_book.gemspec
address_spec passing