Fix bug that happens when neobundle.vim installed
Merge branch 'master' into mac
Add failing message in setup.sh
Merge branch 'master' into mac