Updates from work
Merge branch 'master' of github.com:cles/dotfiles
Fixes from work