merged in changes from master branch.
Some changes to vimrc and bashrc.