added conceal characters for haskell and removed autocmd for check type
Merge branch 'master' of github.com:tusj/vim-config

Conflicts:
	ftplugin/haskell.vim
disabled ycm automatic popup, added ft handling for cabal