Removes username and adds city/state to registration form, fixes #1.