Update master to ease work of updating cljs-in-cljs

This is a master branch update to ease the work of updating cljs-in-cljs.