20141201 from yyang
Merge branch 'master' of https://github.com/cupyy/vim_local