committing production branch of Puppetfile
Merge branch 'testing' into production
adding hiera.yaml
Merge branch 'testing' into production

Conflicts:
	Puppetfile
fixing prod
Development Puppetfile
Master Puppetfile
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 'testing' into production
Merge branch 'production'
synchronizing the control module
setting up master branch
adding demo module
adding demo module
added roles & profiles
adding roles & profiles
adding hiera data