Minor automation improvements
Merge branch 'master' of github.com:houeland/kolproxy

Conflicts:
	scripts/automation/macros.lua
	scripts/automation/scripts.lua