Reorg Bundle imports a bit. Use some different clojure bundles.

Signed-off-by: Geoff Lane <geoff@zorched.net>