MODKEY fixes
Made MODKEY saner
Merge branch 'master' into modkey

Conflicts:
	config.h
Merge pull request #2 from elken/modkey

Merge in MODKEY changes