optimized .vimrc and .gvimrc
Merge branch 'master' of https://github.com/keyhom/share

Conflicts:
	vimfiles/_gvimrc