Reverted a tiny bit.
Correcting java-source-paths for modern lein.
Switching cantor version.
Merge branch 'master' into old-state