put clock in prompt
Make frame title interesting
general mangling
Merge branch 'master' of github.com:larkery/.shared

Conflicts:
	.xmonad/xmonad.hs
remove marmalade
quassel theme
update pp