fixed first peerSetup test
socket stub test WIP
added socket stub method and test to make sure callback is called
fixed merge conflict
Merge branch 'jseip1679'
code cleanup
test cleanup
;
documentation tweaks
Configured concat and uglify, renamed concat files to take inspiration from jquery
Removed IIFE from workerExternal
Client intro semicolon fix
Updated demo
Merge branch 'master' of https://github.com/bchu/nodetron into brian

Conflicts:
	client/peerSetup.js