Make bundles script more portable

Should be usable on windows now.
Make bundles script more portable

Should be usable on windows now.
Merge branch 'master' into grapefruit