Merge in new readme and nijotz stuff

wooooooo