Merge branch desktop into master
Merge branch 'master' of github.com:nil-/dotfiles
updated urls
Merge branch 'master' into laptop