ycm
Merge branch 'ycm'

* ycm:
  ycm

Conflicts:
	plugin/settings/neocompl.vim
	vimrc
fixup haskell plugins