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
Merge branch 'master' into work

Conflicts:
	xmonad.hs
Merge branch 'master' into work
Merge branch 'master' into work

Conflicts:
	.conkyrc
Merge branch 'master' into work
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