misc changes from 2 weeks ago - not critical
Merge branch 'master' of https://github.com/tjscooper/expresso-training-manual