Move the quote to the proper place on GB keyboard.
Add windmove to .emacs
Allow dumb terminals to connect to zsh
Modify mutt to allow spaces in passwords
Add core alias for ghc
Merge branch 'master' into work

Conflicts:
	.zshrc
Auto-collapse threads in mutt
Add windmove to .emacs
Merge branch 'master' into work
Add mail check to conky
Add mail to conky
Merge branch 'master' into work

Conflicts:
	.conkyrc
Add offlineimap
Don't sync the All Mail folder
Fix time colour marker in dzen
Remove power checking from dzen on work desktop
Isolated the volume as a number
Merge branch 'master' into work

Conflicts:
	.conkyrc
Fix file name
Load maildir in emacs