Minor clean ups and changes to make puppet-lint happy
Release 0.2.6