Replaced isoval_opts with isoval_base and isoval_offset.
Allows changing the base isovalue for different types of files.
Added -cube -wedge -frustrum options to mergeTest to allow for different isovalues.
Added -cube -annulus -wedge -frustrum flags to mergeTests.py to set different
base isovalues.