roll up of july changes
Merge branch 'master' of github.com:thurn/dotfiles