.
Merge branch 'develop' of github.com:inercia/evy into develop

Conflicts:
	Makefile
	evy/io/sockets.py
	evy/io/sockets_uv.py