code cleanup
Merge branch 'master' of github.com:ahonor/rundeck-vagrant

Conflicts:
	primary-secondary-failover/bootstrap.sh