small changes following fh's _vimrc
Merge branch 'master' of https://github.com/lazyzyf/myvimrc