Some changes.
Merge branch 'master' of github.com:IanFinlayson/config

Conflicts:
	xmonad/xmobar.hs