Fixed some issues in bashrc and vimrc
Merge branch 'master' of github.com:prius/.bashrc