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

Path for `cdir` and `vdir` in my previous commit was improperly concatenated.

Fix that and also change fixtures and Modulefile to use puppetlabs' concat.