set up mikes config and ports, dont merge

config.json

@@ -2,7 +2,7 @@
 	"id":"lab",
 	"store":{
 		"class":{"read":"CouchdbReader","write":"CouchdbWriter"},
-		"args":{"uri":"http://localhost:5000","dbname":"mike-db","uid":"cloud"}
+		"args":{"uri":"http://dev.the-phi.com:5984/","dbname":"mike-db","uid":"cloud"}
 	},
 	"procs":["Google Chrome","mail","Safari"],
 	"folders":["/Users/michaelmead/Downloads","/Users/michaelmead/tmp"],

src/api/index.py

@@ -288,7 +288,7 @@ if __name__== '__main__':
 	
 #	ThreadManager.start(CONFIG)	
 	if 'port' not in SYS_ARGS.PARAMS :
-		SYS_ARGS.PARAMS['port'] = 5000
+		SYS_ARGS.PARAMS['port'] = 8484
 	PORT = int(SYS_ARGS.PARAMS['port'])
 	app.run(host='0.0.0.0' ,port=PORT,debug=True,threaded=True)
 

src/utils/agents/data-collector.py

@@ -112,4 +112,4 @@ class ICollector(Thread) :
 if __name__ == '__main__':
 	thread = ICollector()
 	# thread.daemon = True
-	thread.start()
+	thread.start()