xmonad
Merge branch 'master' of github.com:colbell/dotfiles

Conflicts:
	bin/xmenud.py