updating to head
Merge branch 'master' of github.com:nuttzman/dotfiles