updated setup.sh
Merge branch 'master' of https://github.com/yaoster/dotvim