Backport Henry's fixes from master
Merge branch 'ampcamp3' of github.com:amplab/training into ampcamp3