Cleanup, build fixes and attempt to add Jython and Jynx to the JAR