- Add command line option to specify the template dir - Make the template dir location feature more robust via distutils - Merge my changes to pyandoc upstream