Scala cleanups/addition of scala command syntax
Merge branch 'scala'