Cheffile, .gitignore
Merge branch 'master' of github.com:delianides/chef-php