Merge pull request #4 from matthewbarr/autoslave

Autoslave
Merge pull request #5 from rtyler/master

Keeping up to date
fix for slave not running under puppet
Merge branch 'master' of github.com:matthewbarr/puppet-jenkins
Merge of autoslave
Merge branch 'master' of github.com:rtyler/puppet-jenkins into rtyler-master

Conflicts:
	manifests/slave.pp
fixed slave.pp
Merge branch 'master' of github.com:jenkinsci/puppet-jenkins