Develop

Updates to readme and build.xml mainly, many small changes otherwise.