Config changes to EC2
Fix conflicts
Added back database.yml
Merge pull request #351 from maplesyrup/ec2-fix

EC2 config changes