Merge branch 'master' into neocomplcache
vimwiki: unmap = after changing filetype
ftplugin/rfc.vim: better reference jump

This makes reference jump work with RFC 4960 and RFC 3550.
Thanks to Marcelo Montú.
markdown taglist setting
add vimgitlog.vim plugin

https://github.com/kablamo/vim-git-log
Merge branch 'master' of github.com:lilydjwg/dotvim
add support files for JavaScript Templates

This library: https://github.com/blueimp/JavaScript-Templates
python: set 'sw' cleverly
neosnippet 更新
[neosnippet] remove annoying snippet
[neosnippet] snippet 以词界而非空白分隔，或者其前是开括号

开括号：比如扩展「.」为「self.」时，函数调用时「(.」也可以扩展
Merge branch 'master' of github.com:lilydjwg/dotvim
使用 wildignore 过滤 pyc 文件
ftplugin/python: default to sw=2
Merge branch 'master' into neocomplcache

Conflicts:
	autoload/neocomplcache/sources/snippets_complete.vim
	autoload/neocomplete/sources/neosnippet.vim
	autoload/neosnippet.vim
	autoload/neosnippet/util.vim
	autoload/unite/sources/neosnippet_file.vim
	autoload/unite/sources/snippet.vim
	autoload/unite/sources/snippet_target.vim
	doc/neosnippet.txt
	plugin/neosnippet.vim

此冲突是因为 neosnippet 更新。选择「删除」的版本即可。
matchit.vim update
syntax/tornadolog: add Critical level highlight
[neosnippet] better snippet pattern
neosnippet: remove some snippets
syntax/python: remove no longer-used config