Re-enable scala-mode support
Cleanup key-binding definitions