add vim-scripts/haskell.vim plugin
some plugin add
Merge branch 'formac'

Conflicts:
	zsh.d/zshenv