Updates to handle 32-bit 6.1.5 and 64-bit 3.1.0.6. Better integration with Wine for Mac version.