update for recent merges
upgrade CLJS 0.0-1978