Adds folding options to allow folding by block

LGTM
-Quentin
Merge remote-tracking branch 'origin/master' into kk-use-nicos-vim-config

Conflicts:
	vimrc