syntax fixes and adjustments for nilclass' sockethub lib
shuffling sockethub code...
Merge branch 'nick-master'

Conflicts:
	main.js