Updated timings
Merge branch 'contact-reduce' of https://github.com/edrumwri/Moby into contact-reduce
Re-integrated integrators back into the master
Merge branch 'contact-reduce'
Merge branch 'master' of https://github.com/edrumwri/Moby
Restored integrator type