Updated vimrc
Merge branch 'master' of github.com:joninvski/vim

Conflicts:
	vimrc