fix merge conflict stuff around plantuml
add yas-minor-mode hooks everywhere because I'm a moron