Cleaned up the timeloop
Merge branch 'cudaupstream' into bigmerge

Conflicts:
	src/timeloop.cxx