Added scaladoc; tidied.
Merge branch 'master' into scala-2.10.x