Add missing '

Conflicts:
	all.md
	session05/notebook.md
	session05/slides.md
Misplaced '
Make the notebook work by including setup

Conflicts:
	session05/01CodingConventions.md
Need to define notebook setup in one of the content files because of Jinja ordering
Misnamed include for notebook setup
Merge branch 'staging' of github.com:UCL/rsd-engineeringcourse into staging

* 'staging' of github.com:UCL/rsd-engineeringcourse:
  Some work lesson 6
  Retitle exercise
  Fix bugs in pycon fragments, and add assertion to dexy build to prevent recurrence
  Object-oriented refactorings
  Notes on refactoring
  Tweak deploy script to match new filter
  Add notes on using Sphinx
  Tweaks to comments section
  Comments section for session 5
  Coding conventions section
  Show code as well as results for bash fragments
  Start to work on lessons 5 and 6
  Revert "Remove future lessons"
  Move headings to improve layout of PDF notes
  Get the notes working again
  Use non-interactive backend for matplotlib
  Revert "Deal with non-installation of greeter module on production"
  Revert "Tree is not installed in production; workaround"
  Revert "Further deal with non-installation of package on production"

Conflicts:
	all.md
	session05/01CodingConventions.md