Update zeitgeist package name
Replace shutdown menu
Merge branch 'master' into json-log

Conflicts:
	xmonad.hs