Update cljs and add tools.macro