Merge branch 'master' of github.com:narkisr/celestial-sandbox

Conflicts:
	.gitignore
	hieradata/common.yaml
Merge branch 'master' of github.com:narkisr/celestial-sandbox