zmq config update
Merge remote-tracking branch 'github/master'

Conflicts:
	pickaxes/zeromq/zmq.configure.sh