fix bootstrap for heroku
Make a basic User model (including secure passwords)
Merge branch 'modeling-users'