Bugfix: Actually increment template_nonce when we use it
Merge branch 'tmpl_nonce' into bfgminer

Conflicts:
	miner.c