Subtle updates in makefile/travis config
Merge branch 'master' of github.com:aio-libs/aiozmq

Conflicts:
	Makefile
Make tests more stable