Remove database.yml from vagrant chef cookbook. Don't need to copy database.yml anymore.
Merge remote-tracking branch 'upstream/master'