Merge remote-tracking branch 'origin/master' into socket.io1.x

app.js

@@ -110,7 +110,6 @@ function start() {
 
 	// nconf defaults, if not set in config
 	if (!nconf.get('upload_path')) nconf.set('upload_path', '/public/uploads');
-	if (!nconf.get('bcrypt_rounds')) nconf.set('bcrypt_rounds', 12);
 	// Parse out the relative_url and other goodies from the configured URL
 	var urlObject = url.parse(nconf.get('url'));
 	nconf.set('use_port', !!urlObject.port);