Updates after Canopy run through
Formatting tweaks
Formatting tweaks
Merge branch 'instructors' of https://github.com/mikej888/2013-12-03-edinburgh into instructors