various nefarious hacks to try and get my plantuml diagrams into ODT files
Merge branch 'customizations' of github.com:cbilson/prelude into customizations

Conflicts:
	personal/custom.el