Removes username and adds city/state to registration form, fixes #1.
Fixes broken user feature test.
Merge pull request #57 from MarcGarreau/check-registration-form

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