Hopefully fixed misaligned reduction
Fix merge
Merge branch 'master' of github.com:hpce2014/hpce-2013-cw6

Conflicts:
	include/bitecoin_opthashing.cu