Let's only ignore database.yml. config/aws.yml doesn't need to be ignored, it shouldn't be in there at all. We can pull from ENV as necessary.