Merge pull request #6 from HEP-Puppet/master

Accomodate both methods of configuring maui and torque