Add rst2pdf, odt2sphinx
Merge remote-tracking branch 'origin/master'