Fixed a bug in keymap.py Also moved installation thread code to another file
keymap bug fix
Upgraded keymap
Merge remote-tracking branch 'upstream/master'
resovle conflicacking branch 'upstream/master'
Conflicts:
	src/keymap.py