Set conky to turn the time red if it's after five.
Merge branch 'master' into work
Put commas at front of line in myManageHook
Added documents to workspaces
Merge branch 'master' into work

Conflicts:
	xmonad.hs
Fixed sunset in emacs org calendar
Merge branch 'master' into work
Merge branch 'master' of github.com:rprospero/dotfiles
Merge branch 'master' into work

Conflicts:
	.conkyrc
Added gnus email to emacs
Merge branch 'master' into work
Merge branch 'master' into laptop
Make .emacs package archive multiline
Fixed xmonad to work with java
Add Marmalade archive to elpa
Start ido-mode on system loadup
Start the emacs server for incoming connections
Added .muttrc
Merge branch 'master' into laptop

Conflicts:
	.conkyrc
	.emacs
Fix mutt to use the command line client