Merge remote-tracking branch 'winston_upstream/master' into winston_mods

Conflicts:
	lib/winston/common.js
	lib/winston/container.js
	lib/winston/logger.js
	lib/winston/transports/console.js
	lib/winston/transports/file.js