created user form and neighborhood seed data
fixed merge conflicts in user forms. created neighborhood seed data.
Merge branch 'item-upload' of github.com:redswaggon/red-wagon into item-upload