fixed setup script
Merge branch 'master' of https://github.com/timdonegan/dotfiles