Cleanups from scapegoat

So I have been playing with Scapegoat by @sksamuel (https://github.com/sksamuel/sbt-scapegoat) which is a scala lint too.  Whilst is definitely still a work in progress, is currently being improved on a daily basis.

The report it generates should be considered indicative, but highlighted some interesting things to cleanup.
This PR is basically a bunch of the items it has flagged (nothing too major)

Is it possible to still have the "Doc Event" comment blocks next to their respective events in the match statement below? My fear is that someone will add a new event type and forget to document it.

Also, I'll need to go to my linux box to check it, but I think the manual generator depends on the closing "*/" to find the end of a "Doc event" block.