Tree-Merge commit '2843670' into cg_merges_20131108a

Conflicts:
	01-cgminer.rules
	ASIC-README
	README
	api.c
	configure.ac
	driver-klondike.c
	miner.c
	miner.h
	usbutils.c
	usbutils.h