removed better_errors, added database.yml back, since we think vagrant sucks