Added haskell plugin for vim
Merge branch 'master' of http://github.com/ktaube/dotfiles

Conflicts:
	vim/vimrc