change bundler's implementation to use q-stream
ensure a q-stream is returned by bundler.bundle()
get the bundler.bundle() optional callback function working