modified:   vimrc
Merge branch 'master' of github.com:jaredjpruett/Resources