haskell
sudo alias cmap
Merge branch 'master' of https://github.com/jaramago/vim-haskell

Conflicts:
	.gitmodules