WIP - Associate shop with user

Need to merge in index_test branch
At some point I'd go through your tests and make use of your lovely login helper here instead of manually logging in in each test.  Don't have to do it now, but should refactor at some point.