Add Tim's conj talk to README
Merge branch 'master' into putret
fixed putret to work on cljs