update options
Merge branch 'master' of github.com:korbenzhang/vimrc