mnor changes to bashrc and vimrc.
Merge branch 'master' of http://github.com/horsetailfiddlehead/basic
Merge branch 'master' of http://github.com/horsetailfiddlehead/basic
added DiffOrig command