reformatting
Merge branch 'master' of github.com:johnpena/dotfiles
updates to bashrc and vimrc
Merge branch 'master' of github.com:johnpena/dotfiles