Install git flow completion for bash.
Disables creation of .orig files when using a mergetool.
Adds syntax highlighting for groovy scripts.