convert cookbook_name to string for database.yml
Merge remote-tracking branch 'jwilf/master'