Updated vimrc
Merge branch 'master' of github.com:enter-the-bot/dotfiles

Conflicts:
	vimrc