Add Tim's conj talk to README
Merge branch 'master' into dunaj
support for dunaj aliases