updated vimrc to be more in line with what I want
Merge branch 'master' of github.com:wesleykerr/config

Conflicts:
	vimrc