Do not process the `diamond.conf` template if hosts variable is not set
Fix path
Access to the property of a pillar with a dot-notation
Merge branch 'set_hosts'

Conflicts:
	diamond/files/diamond.conf