docs
Merge branch 'master' of github.com:johnantoni/dotfiles