changing minion to terse
Merge branch 'master' of https://github.com/johnnygaffey/salt-states

Conflicts:
	core/salt/minion