Merge branch 'master' of github.com:adriankral/multilogger

Conflicts:
	lib/multilogger.js
Merge branch 'master' of github.com:adriankral/multilogger