Tidying up
Merge remote-tracking branch 'origin/master' into gh-pages
Add homework review slides, minor changes