Latest changes, and timing code.
Merge branch 'master' of https://github.com/alvarezcl/galsim_work