Just changed some formatting
Merged manually
OCD'd the formatting for a couple classes, and completed the 'buildindex' self-contained simple indexing script.