Add mouse wheel
Cleaner Neko init
Begin integrating Neko support
Merge branch 'next' into fix-mac-manifest