disable shim plugin, which seems broken on current vim
install tpope's vim-characterize plugin
amend hugin java paths to 7
git: use diff3 conflict style