Merge pull request #388 from nortikin/docs-pass-1b

Docs pass 1b (docs and indexviewer code shuffle)
Merge remote-tracking branch 'origin/master' into docs-pass-1b