Alters README.md to reflect some new things that were brought to light.
Fixes merge conflict