Added CLI Presenter, started changes to PuppetMaster
More presenter changes