Merge pull request #126 from simonbingham/develop

Code formatting amendments
Fix page_slug for sample pages.