Merge branch 'desktop' of github.com:brotatos/dotfiles into desktop