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
Merge branch 'master' of github.com:ethinx/.vim
Merge branch 'master' of github.com:ethinx/.vim
Merge branch 'master' of github.com:ethinx/.vim
Merge branch 'master' of github.com:ethinx/.vim
configure cscope