Comment out fast-forward only on merge in global gitconfig
Treat deface like erb for syntax stuff in vim