vimrc changes
Merge branch 'master' of github.com:bddicken/rc