Merge in new readme and other changes