Clean up User migration and remove password field from User#edit

When upgrading from the last commit you will need to run the following tasks: rake kill_postgres_connections, rake db:reset, rake db:migrate, rake db:test:prepare, rake db:seed