Update screen setup script
Merge branch 'master' of github.com:cespare/dotfiles