zergte
Merge remote-tracking branch 'github.r/common' into plop

Conflicts:
	.vim/bundle/bundles.vim
	.vim/ftplugin/haskell.vim