wip
merge branch 'master' of github.com:burke/dotfiles