more uncommited changes from other machine
Merge branch 'master' of github.com:stevestmartin/dotfiles