Changed user model to make username email address. Added Leigh's files
Merge branch 'master' of https://github.com/lilsplat/bowser