Merge branch 'master' oft merge upstream/master
Change to puppetlabs' concat.

Fix concat's paths
Merge branch 'concat'
Change dependency to puppetlabs' concat >=1.0.0
Merge pull request #43 from netmanagers/master

Fix bad path in previous commit and change to puppetlab's concat