Fixing setup.sh
Merge branch 'master' of github.com:jprjr/dotfiles