Convert OpenDocument files to text before diffing
Use numbers for misc tags
Merge branch 'master' of https://github.com/l0b0/tilde
Merge branch 'gitconf-old' of https://github.com/l0b0/tilde into gitconf-old

Conflicts:
	.gitconfig