master + readme-edits

Take a look at these. I think it's time. ;)