Minor changes, I think?
Merge branch 'master' of https://github.com/TheWizardTower/dotfiles

Conflicts:
	bashrc
Git weirdness. I should probably read the git book. :P
Merge branch 'master' of https://github.com/TheWizardTower/dotfiles
Mucked with the install script, and removed a needless line in bashrc.
Also, dbus doesn't work in xmonad, and I don't use gnome. I use KDE. So
I mucked with xmonad.hs to reflect both.