Edits second pass, nearly complete.
Typesetting from...a bunch of people.
Updated TS.
Finished edit first pass.
Edit second pass.
Merged in all pieces.
Merge pull request #6 from haplesshero13/master

Merged in all pieces.