Merging ninos changed

I don't think README is technically required; the setup.py now points to README.md. I could be missing something here tho.