Merge branch 'desktop' into laptop

Conflicts:
	xmobarrc
Laptop-specific improvements to xmobar & xmonad.