Merge branch 'bfgminer' into kncasic

Conflicts:
	.travis.yml
	configure.ac
Merge commit 'f8be55e' into kncasic

Conflicts:
	driver-kncasic.c