update vimrc
Merge https://github.com/pineconea/backup

Conflicts:
	vimrc