Merge branch 'master' of github.com:absalon-james/heat-things

Conflicts:
	minion_stack.yaml
Merge branch 'master' of github.com:absalon-james/heat-things