Added username field to user models

Updated login to use the username rather than email address