update puppetlabs/concat > 1.0.0
Merge pull request #16 from jhoblitt/concat_update

Concat update
Merge branch 'master' of https://github.com/puppetlabs/puppetlabs-puppet

Conflicts:
	manifests/master.pp