Applied puppet style guide
Merge pull request #306 from strider/master

Applied puppet style guide
Merge remote-tracking branch 'upstream/master'