Update README to match master - prepare to merge