Cleaning up WiX warnings.

Use "-arch" compiler flag to set MSI architecture.
Merge branch 'installer-cleanup'