Merge pull request #641 from DrTimothyAldenDavis/dev2 #868

Job	Run time
mingw (MINGW64)	15m 2s
mingw (MINGW32)	15m 51s
mingw (CLANG64)	15m 54s
mingw (CLANG32)	12m 32s
ubuntu (gcc with CUDA with OpenMP, both)	5m 37s
ubuntu (gcc without CUDA with OpenMP, both)	4m 51s
ubuntu (clang with CUDA with OpenMP, both)	6m 31s
ubuntu (clang without CUDA with OpenMP, both)	4m 19s
ubuntu (gcc without CUDA without OpenMP, )	3m 36s
ubuntu (gcc with CUDA with OpenMP, static)	7m 15s
	1h 31m 28s

Provide feedback