Initial commit
Merge remote-tracking branch 'upstream/master'
Refactored classes for puppet-lint compliance