Changes to be committed:
	modified:   .vimrc
Merge branch 'master' of https://github.com/wreed4/vimrc

Consolidating changes made at work and at home.