256 colors
Merge branch 'master' of github.com:mhansen/xmonad

Conflicts:
	tmux-open