Updates to build.xml; other updates
Merge branch 'master' of https://github.com/255/catan