rename file from -03 to -04
fix up some bundle port stuff
more changes around bundle
Merge remote-tracking branch 'origin/cj5'
Tweaked some text around BUNDLE, bundle-only - added open issues on things that aren't baked yet