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