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