Reindent things.
Change to sample from box after hide box.
Merge branch 'master' into gh-pages
grunt
Fix bug where scriptlets are incorrectly displayed in sticigui
interactive exercises.
Clean up normhilite.
Merge branch 'master' into gh-pages
grunt