making git diff actually generate usable stuff
vimrc: more cleanup, haskell improvements