~("~)
Merge branch 'desktop' of https://github.com/abresee/config into desktop

Conflicts:
	.zshrc.local
fixed removal of signal level from desktop config
Merge branch 'desktop'
removed obsolete files script
Merge branch 'master' into laptop