Move gvimrc into vimrc
Merge branch 'master' of github.com:cutwater/vim-config

Conflicts:
	vimrc