shut up about deprecated Xlib functions
use st as default terminal from now on
added st to SEE ALSO section
include font argument for st by default
Switch to i3lock
Merge branch 'master' into personal

Conflicts:
	config.def.h
	config.mk