Comment marmalade and re-enable MELPA.
Set octave-mode and disable menu-bar-mode.