Updated setup scripts
Merge branch 'master' of github.com:DanNixon/dotfiles