fix server_id
Merge remote-tracking branch 'origin/master'
fix server_id
fix server_id
fix server_id - make it random when running from a puppetmaster
Merge pull request #10 from continuent/master

Merge in server-id fix