Just about everything taken care of
Merge branch 'master' of https://github.com/tjscooper/expresso-training-manual