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