minor changes to user controller, form for user done
Merge pull request #8 from econnors/userbranch

minor changes to user controller, form for user done