Ubuntu 10 support fixed: changed brianmercer repository path
Ubuntu 10 support fixed: conf_file path changed to php5-fpm.conf
restart php-fpm service on config file changes
Added ability to set catch_workers_output setting in the pool config file.
Ubuntu 13.10 does not allow php5-fpm service to be used with init
Start php-fpm by default and restart on configs change
Merge branch 'ubuntu-13.10-upstart' of github.com:fxposter/cookbook-php-fpm into fxposter-ubuntu-13.10-upstart
Merge branch 'restarts' of github.com:fxposter/cookbook-php-fpm into fxposter-restarts
Merge branch 'ubuntu-10-fix' of github.com:onddo/cookbook-php-fpm into onddo-ubuntu-10-fix
Bump version
Clean up sandbox helper files
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