Merge branch 'master' into deadking

Conflicts:
	game/mod.c
Adding movement modes (gaits) and making GUI do a little something.