cosmetic fixes
Merge branch 'master' of github.com:sockethub/sockethub

Conflicts:
	lib/protocols/sockethub/dispatcher.js
fixed pinger, one test not passing but not sure why