Made a minor change to allow mergedx2 to allocate more than 4GB of memory.  Also got rid of some magic numbers, and fixed the option parsing mess.