Update readme, and fix bad merge