added git://github.com/rupa/j2.git
added vimdiff as external git diff viewer
Merge branch 'master' of github.com:tomtomsen/.dotfiles