changes to emulator key handling
Merge branch 'master' of https://github.com/dwetterau/fb-hack-2014