Code cleanup, water improvement, file filtering

- Cleaned up and removed some unused code in both the template and the
Java code.
- Files not ending in ".mca" are now skipped when loading region files
- Expanded test region
- unions are no longer created for blocks