Fix TOC link normalization

Corrects for unexpected & in url and id strings.
Cleanup layout, commented elements
Merge pull request #185 from github/curriculum-tune-up

Curriculum tune up, fix TOC JavaScript fail on unsupported characters.