opps
Merge branch 'pahoughton-devel' of github.com:pahoughton/puppet-master into pahoughton-devel

Conflicts:
	files/pagent