remove acp.
remove project.vim
Merge branch 'master' into osx