changes commited prior to merge
Merge branch 'users' of https://github.com/PatGW/crowd into users
updated conflicting migrations and removed fixtures for testing
Merge branch 'users' of https://github.com/PatGW/crowd into users