Adds supervisor role and profile
Adds bugfix to php.yaml
Adds ssh module
Adds cd to /vagrant
Adds line endings fix
Merge branch 'master' of https://github.com/SBallert/vagrant

Conflicts:
	provision/puppet/environments/development/hieradata/php.yaml
Merge branch 'master' of https://github.com/SBallert/vagrant