Haskell additions
Merge branch 'master' of https://github.com/jd1123/vim

Conflicts:
	.vimrc