add haskel folding bundle
Merge branch 'master' into neocomplcache

* master:
  add haskel folding bundle

Conflicts:
	vimrc