Add some options for neocomplete.vim
Merge branch 'master' into mac