Merge pull request #20 from ysshah/david

removed old migrations
added name field to registration page, still not pretty
Merge pull request #21 from ysshah/thomas

added name field to registration page, still not pretty
resolved conflicts with master