My vimrc
Merge branch 'master' of https://github.com/srhopkins/dev
Added vimrc