Update readme and release info.
Fix merge issues