changes in vim
Merge branch 'master' of https://github.com/apruden/dotfiles
add bashrc