fixed total time bugs, other miscellany
Merge branch 'master' of https://github.com/laurabreiman/science-of-cooking