some cleanup and fixing breaking bug introduced by merge

app.js

@@ -18,6 +18,7 @@ fs.readFile(path.join(__dirname, 'config.json'), function(err, data) {
 					global.config[c] = config[c];
 				}
 			}
+			console.log(global.config);
 
 			var categories = require('./src/categories.js'),
 				templates = require('./public/src/templates.js'),
@@ -82,8 +83,10 @@ fs.readFile(path.join(__dirname, 'config.json'), function(err, data) {
 
 		process.stdout.write(
 			"\nWelcome to NodeBB!\nThis looks like a new installation, so you'll have to answer a " +
-			"few questions about your environment before we can proceed with the setup.\n\n\nWhat is...\n\n"
-			);
+			"few questions about your environment before we can proceed with the setup.\n\n" +
+			"Press enter to accept the default setting (shown in brackets).\n\n\n" +
+			"What is...\n\n"
+		);
 
 		ask('... the publically accessible URL of this installation? (http://localhost)', function(base_url) {
 			ask('... the port number of your install? (4567)', function(port) {

src/feed.js

@@ -2,10 +2,7 @@
 	var	RDB = require('./redis.js'),
 		schema = require('./schema.js'),
 		posts = require('./posts.js'),
-		topics = require('./topics.js'),
-		config = require('../config.js');
-
-
+		topics = require('./topics.js');
 
 	function saveFeed(feed, xml) {
 		feed.endEntry();
@@ -16,7 +13,6 @@
 		var ATOMWriter = require('atom-writer'),
 			feed = new ATOMWriter(xml);
 
-
 		return feed
 				  .startFeed(urn)
 				  .writeStartIndex(1)
@@ -74,10 +70,7 @@
 
 	};
 
-
 	Feed.updateCategory = function(params) {
 
 	};
-
-
 }(exports));