Cleaned away extra index and search links
More streamlining
Improved formatting: 72 char lines, clearer comments
Merge branch 'master' into gh-pages
Improved formatting: 72 char lines, clearer comments