Revised command structure and key and mouse button mappings
Added support for multiple commands per key/button mapping; elegant fix for issue #150
resolve conflicts for merge
Merge remote-tracking branch 'upstream/master'

Conflicts:
	commands.c
	config.def.h
fix naming..