Merge in the clewis + davelab6 jeykll

[davelab6]

I merged this to demo the site quickly, but I've just removed the merged commits from gh-pages branch as the new version shouldn't go live just yet