Puppet cleanup - added command line port numbers, removed private SSL keys from github, auto-regen of keys if missing