Rearrange vimrc, replace haskell plugins
Merge branch 'master' of https://github.com/royalaid/dotfiles