Merge pull request #6 from HEP-Puppet/master

Accomodate both methods of configuring maui and torque
Merge pull request #7 from HEP-Puppet/oxford-development

Merge pull request #6 from HEP-Puppet/master