Install zmq for travis tests
Merge branch 'master' into wip-srs-retcon

Conflicts:
	.gitignore
Fix warnings