Simplify keypress detection

Also get rid of the macros dealing with longs, because none of the code is actually using longs.
Merge branch 'patch-2' of https://github.com/lurch/noobs into dev
Update output files