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)