bug fixes
Merge branch 'master' of https://github.com/angryelectron/automate

Conflicts:
	drbd.sh