Added back in haskellmode-vim and haddock.