Xmonad/git update
Merge branch 'master' of github.com:GregSutcliffe/dotfiles

Conflicts:
	gitconfig
	xmonad.hs
Clean up xmobarrc