Whoops. I was linking to the wrong repository.
Update readme.
Merge master. Fix conflict