Merge branch 'master' of github.com:jshholland/misc-dotfiles