Revert to using 'librarian-puppet' instead of 'maestrodev' version. The latter seems to have a bug where it ignores Puppet module version specified in Puppetfile.
Merge pull request #17 from tdonohue/DS-1735-plus-others

DS-1735 fix, plus some other improvements/enhancements