Merge remote-tracking branch 'upstream/master'

Conflicts:
	syntax/pandoc.vim
Merge branch 'master' of github.com:lyokha/vim-pandoc-syntax