modifying the Git repos
committing production branch of Puppetfile
Merge branch 'development' into testing
Merge branch 'testing' into production
adding hiera.yaml
adding hiera.yaml
Merge branch 'development' into testing

Conflicts:
	Puppetfile
resolving differences
Merge branch 'testing' into production

Conflicts:
	Puppetfile
fixing prod
Development Puppetfile
Master Puppetfile
Testing Puppetfie
Production Puppetfile
correcting small syntax error that was breaking the filebucket.  Strange... worked prior to my upgrade to Yosemite, and only just reared its head.  Beginning testing.
done
Merge branch 'development'

Conflicts:
	Puppetfile
Merge branch 'development' into testing
Merge branch 'testing' into production
Merge branch 'production'