Merge pull request #236 from cekoski/master

zyre_node_start was not passing the correct port number in the beacon message
Whitespace fix
Minor code cleanups
Merge pull request #237 from hintjens/master

Minor cleanups