Adjusting the build to properly include the Scala stuff.
Merge remote-tracking branch 'origin/master'
Scala's nullable types (i.e. Option) doesn't really work well for
emulating database operations. I'm going to use Java's boxed primitives
for now to represent NULL values, and maybe I'll try to revisit this
later to see if I can construct my own nullable types in Scala that
behave like database NULLs.