updated winston config to only use json logging if --json-logging flag is passed in or set in config

app.js

@@ -38,11 +38,11 @@ winston.add(winston.transports.Console, {
 	colorize: true,
 	timestamp: function () {
 		var date = new Date();
-		return (global.env === 'production') ? date.toJSON() :	date.getDate() + '/' + (date.getMonth() + 1) + ' ' + date.toTimeString().substr(0,5) + ' [' + global.process.pid + ']';
+		return (!!nconf.get('json-logging')) ? date.toJSON() :	date.getDate() + '/' + (date.getMonth() + 1) + ' ' + date.toTimeString().substr(0,5) + ' [' + global.process.pid + ']';
 	},
 	level: nconf.get('log-level') || (global.env === 'production' ? 'info' : 'verbose'),
-	json: (global.env === 'production'),
-	stringify: (global.env === 'production')
+	json: (!!nconf.get('json-logging')),
+	stringify: (!!nconf.get('json-logging'))
 });