flesh out user model
unignore database.yml
merge Jurgens changes