added markers for vim folding
Merge remote-tracking branch 'origin/master'

Conflicts:
	syntax/pgsql.vim