Update vimrc
Merge branch 'master' of github.com:mjs2600/dot_files

Conflicts:
	dot_vimrc
Merge branch 'master' of github.com:mjs2600/dot_files

Conflicts:
	dot_vimrc