adding a githook
fixing indentation of hashes
fixing indentation and syntax
Merge branch 'master' of github.com:timhughes/timhughes-repos

Conflicts:
	manifests/epel.pp
	manifests/puppetlabs.pp