Fix vimrc.
Fix vimrc.
Merge branch 'master' into twitter