Edited xscreensaver + started via .xinitrc
Added keystroke to run 'lock'
Merge branch 'master' into notebook

Conflicts:
	.wmii-hg/wmiirc
	.xscreensaver
	.zsh_aliases