Merge branch 'puppet_provider' of git://github.com/Jimdo/puppet-module-supervisor into Jimdo-puppet_provider

Conflicts:
	.gitignore
Restore title of supervisor process service

Refactores supervisorctl arguments: it will always use some-prog:* even
if `numprocs` is 1. This works. See
https://github.com/Supervisor/supervisor/blob/master/supervisor/options.py#L1990
Fix the mocked supervisorctl output

We noticed that the mocked output does not match the real supervisorctl
output. This could use some kind of integration testing, maybe with
serverspec.
Refactor tests, use mocha mocking instead of homegrown.

Also test how supervisorctl is called
Adding 'stopasgroup', 'killasgroup' config settings
stopasgroup implies killasgroup so don't include both or you'll get an error
Add EOF line break for nicer 'cat' output
Added PHPStorm specific folders and files to gitignore
Using valid ensure file resource value.
Removed service::enable property.
Merge pull request #61 from schkovich/master

Valid ensure file resource value.
Merge pull request #60 from elasticsales/master

Adding 'stopasgroup', 'killasgroup' config settings
Refactor service.pp a bit
Trivial ordering refactoring
Revert dependencies in service.pp when ensuring it is absent

First stop the service, delete the .ini, reload the config, delete the log dir
Add a semblance of a test for service ensure => absent
Merge remote-tracking branch 'upstream/master' into puppet_provider

Conflicts:
	.gitignore
merging in latest jimdo/puppet_provier