Clean up.
Some code optimizations.
One jar build.

Bumped scala version.
Minor compile bug fix.
Merge pull request #5 from rinmalavi/master

Now published as one jar.