setup.sh updates
Merge branch 'master' of https://github.com/nandryshak/dotfiles
server updatess