Prettified login
Mergefix between Ben's made-up database.yml and Rob's real one