Rename the user model
Some minor fixes
Merge branch 'master' of github.com:riteshk/ferret
Merge branch 'master' of github.com:riteshk/ferret
Merge branch 'master' of github.com:riteshk/ferret
This should fix it