added mvn aliases
added mvn to Bastion
Added vimdiff as default mergetool