Correctly set up the paths for Win32 using the options file
Merge pull request #354 from rjemanuele/test-fixes

Correctly set up the paths for Win32 using the options file
Merge pull request #353 from racker/fixes/bundle_versions

fixes(bundles): version the bundle filenames