Adds support for preserving file extensions
Small tweaks to cxfreeze setup to specify build dir
Merge in upstream changes