CLJS-825: conflict between node js support files

src/cljs/cljs/nodejs.js in conflict with src/cljs/cljs/nodejs.cljs
Merge branch 'master' of github.com:clojure/clojurescript