Switched back to melpa for scala and malabar mode; added malabar mode.