Ubuntu 13.10 does not allow php5-fpm service to be used with init
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
Fixed Merge