Merging in datasift changes

Tweaks to polling system, and headers.
@Rhubbarb changes to fix benjamg/zmqpp#7