changes for a snapshot upgrade
Merge branch 'master' of https://github.com/mikeputnam/dotfiles