Bug fix.
bug fixes
Merge branch 'master' into personal
new vimrc