Merge pull request #33 from jdgleaver/timing-fixes

Minor timing fixes
21 jobs for master in 11 minutes and 21 seconds (queued for 101 minutes and 43 seconds)
latest