Merge pull request #33 from jdgleaver/timing-fixes

Minor timing fixes
21 jobs for master in 11 minutes and 2 seconds (queued for 118 minutes and 24 seconds)
latest