add plantuml snippet
fix magit in osx
Merge branch 'master' of github.com:jaypei/exz-conf