Cleaned up a lot of the sun key codes and the getKeyText method.
Merge remote-tracking branch 'origin/master'