sync
Merge branch 'master' of github.com:eth2net/.vim
Merge branch 'master' of github.com:eth2net/.vim

Conflicts:
	vimrc
Merge branch 'master' of github.com:ethinx/.vim
Merge branch 'master' of github.com:ethinx/.vim
add cursorline
Merge branch 'master' of github.com:ethinx/.vim
Merge branch 'mac'

Conflicts:
	vimrc
Merge branch 'mac'
Merge branch 'master' of github.com:ethinx/.vim
Merge branch 'mac'
minor change
Merge branch 'master' of github.com:ethinx/.vim
add jedi-vim
Merge branch 'master' of github.com:ethinx/.vim
configure cscope
Merge branch 'master' of github.com:ethinx/.vim into mac

Conflicts:
	vimrc
search what file include current file