Using hiera.yaml from puppet folder
Using hiera.yaml from puppet folder
Using git branch for deploy

Conflicts:
	fabfile.py
Changed fabfile git clone command
Merge branch 'master' into notrac