Adding database.yml... for real.
Merge branch 'master' of github.com:andrewhao/mailbox