More improvements to work script
Merge branch 'master' of https://github.com/christopheryoung/dotfiles