Merge branch 'master' of github.com:austinpray/dotfiles