filter out ipv6 addresses on machine deploy script
enabled multi line machine deploy scripts
Merge branch 'celery' into socketio

Conflicts:
	src/mist/io/tasks.py
Merge branch 'socketio' into termjs