ignore mysql database.yml
Merge branch 'staging'