added some extra logging
logging and default values
Merge branch 'master' of github.com:sockethub/sockethub

Conflicts:
	package.json