Add odt2txt as the diff option for odf files
Merge branch 'master' of github.com:jquagga/dotfiles