Bundling for windows.
Some improvements in bundle:osx task.