Merge branch 'ubuntu-13.10-upstart' of github.com:fxposter/cookbook-php-fpm into fxposter-ubuntu-13.10-upstart
Refactor code to not rely on attributes as much (use definitions similar to LWRPs)
Update documentation
Allow deletion of pool config file
Use php-fpm cookbook by default in template, but give ability to specify it
Add support for defining emergency and control variables in conf.
Update pool config file to be more descriptive (adapted from Ubuntu)
Allow for PHP options to be specified when creating pools
Bump version
Merge branch 'feature/emergency_settings' of github.com:Savvii/cookbook-php-fpm into Savvii-feature/emergency_settings

Conflicts:
	attributes/default.rb
Bump version
Merge branch 'fxposter-ubuntu-13.10-upstart'
Bump version
Changing config to default paths
Adding default pool to recipe
Added pool creation to recipe and updated readme
Bump version
Add conf_dir attribute.

In order to customize php when running under fpm, you need to be able to
change the configuration settings.  On ubuntu, that means adding files
in /etc/php5/fpm/conf.d.  This cookbook should at least expose that
location so that files can be added there without having to switch on
distro in every other cookbook.