Made the Socket connection to work
Merge remote-tracking branch 'rt/master'

Conflicts:
	lib/tap_config.js
	package.json
	tap.js