Update vimrc, bashrc
Merge remote-tracking branch 'origin/master'
Update bashrc
Merge remote-tracking branch 'origin/master'
Add hg-completion