Add psutil package intallation to requires
Add supervisor to list of requires
Merge pull request #39 from rallytime/supervisor_tests

Add supervisor to list of requires
Merge pull request #37 from rallytime/fix_psutil

Add psutil package intallation to requires
Resolve conflicts
Merge branch 'dig_tests' of https://github.com/rallytime/salt-jenkins into dig_tests

Conflicts:
	git/salt.sls