update
Merge branch 'master' of http://github.com/cshen/dot_vim