Merge pull request #42 from netmanagers/master

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

Fix concat's paths
Merge branch 'concat'