fixed merge issues
Puppet applies now possible and r10k script allows modules directory to be populated with puppetfile modules