updated with a few minor changes
Merge branch 'master' of https://github.com/sockethub/sockethub-client