Updated database.yml
Updated users_controller.rb because Ross said to.
Merge branch 'master' into base_styles-27-rl
I'm closing this branch because it's kind of old. I'm going to focus on the more specific issues.