refactored for new logger
Maerge branch 'develop' of github.com:darrylwest/socket-model into develop

Conflicts:
	README.md
	package.json