Applying xft patch
Merge branch 'master' into xft-support

Conflicts:
	dmenu.c
adding patch used for xft
Also remove config.h (it is auto-gened)