scala-mode2: Use upstream master.

The enhancement for closing multi-line comments was merged upstream.