changes from code
Merge branch 'master' of github.com:jwilkins/dotfiles