Bugfix: DevAPI: Reduce race-collision delay to 1ms so thread_shutdown actually gets called before threads are killed forcefully
Merge commit 'fcb3023' into bfgminer

Conflicts:
	deviceapi.c
bitforce: Workaround bugs in current firmware for the Chili
Merge commit 'bda65db' into bfgminer