some testing with chefspec and kitchen
Merge branch 'master' of github.com:winmillwill/cookbook-php-fpm

Conflicts:
	attributes/default.rb