Various cleanup.
Merge branch 'master' into clean1
2nd round cleaning based on Harvey's feedback.
Oops ... rearrange import orders in ScriptOperator.scala.
Merge pull request #206 from rxin/clean1

Various coding style cleanup