Fix bug that happens when neobundle.vim installed
Merge branch 'master' into linux