Template the run-puppet-master concat fragment

This allows for the definition of the puppet confdir and vardir values
in the Puppet 3.x run fragment.
Merge pull request #70 from geoffgarside/template-config.ru

Template the run-puppet-master concat fragment