Incorporate some of larsrh's pull request.

The conflict warning stuff has changed in the newer sbt-assembly,
so it's commented out since it doesn't work.