update vimrc
Merge branch 'master' into sanritz
update bashrc. souce tree対応
Merge branch 'master' into sanritz