Split out vimrc into seperate files and added vimdiff to gitconfig