Merge branch 'threaded_gene_server'

Conflicts:
	datafeed/bcfeed_mtgoxUSD_1min.csv