Merge pull request #153 from hintjens/master

Fixed #147 properly
Fix in proper cleaning of inbox socket
Merge pull request #154 from mvala/master

Fix in proper cleaning of inbox socket
Handle terminate status from poller. And better logic for engine loop
Merge pull request #155 from mvala/master

Handle terminate status from poller. And better logic for engine loop
Cleaned up zyre_node main loop

- slightly simpler
- fixed code style (space before '(')