general cleanups, no desktop-only stuff
desktop-only changes to .xmobarrc
Merge branch 'desktop'
ignoring desktop-only changes in merge