Clean up.
Some code optimizations.
One jar build.

Bumped scala version.
Minor compile bug fix.