Merging up development to staging

Includes:

* work on the pages app - allowing for nested pages
* some extra style for help with pages app content
* some simple performance optimisations
* adding a /teach/ tab and the ability to turn it off/on to the main nav