New machine setup
Merge branch 'master' of github.com:jwalsh/dotfiles