added back users table
Merge branch 'master' of heroku.com:nameless-everglades-2928
moved all migrations to one file. deleted other duplicate migration files.