(MODULES-1014) Adding noop mode option
Merge branch 'master' into MODULES-1014/add-noop-mode
Merge remote-tracking branch 'puppetlabs/1.0.x'
Merge pull request #153 from petems/MODULES-1014/add-noop-mode

(MODULES-1014) Adding noop mode option
Merge branch '1.0.x'