custom user model, email for username closes #55
Merge branch 'develop' of github.com:harvard-lil/linky into develop
update settings file, change user model name
Merge branch 'develop' of github.com:harvard-lil/linky into develop