rvm is not happy when loading late...
Load JAVA_HOME and JAVA_JRE in correct order for mvn
git - adding aliases
git - config formatting
git - set vimdiff as merge and diff tool
git - adding missing diff promt config
vim - adding django template surround config