New vimrc
Merge branch 'master' of http://github.com/jex-lin/vim