Perhaps this isn't in the right spirit, but because of Pandoc I've become wedded to writing in a mixture of markdown and latex (latex for the fiddly bits, markdown for everything else)... Is this (or something like it) something you might consider in the future? I work with many non-technical people and write collaboratively using this mixture on etherpads... A proper git history would be a very nice addition to our workflow.