add right vimrc
Merge branch 'master' of github.com:cursorzz/dotfiles

Conflicts:
	vimrc
	vimrc.bundle
	vimrc.local