ENH: set masterport in client's and server's puppet.conf
Merge pull request #28 from atmosfair/port

ENH: set masterport in client's and server's puppet.conf