Update structures
Properly return keybind strings involving Ctrl/Alt
Merge branch 'master' of https://github.com/quietust/dfhack-40d

Conflicts:
	library/modules/Screen.cpp
	library/xml