3.5.2:
	Removed xmodmap support, would be handled in g-s-d through the scripts.
	Some minor build fixes as well.