Cleaned up readme

Previous version had merge conflicts, this should be fine now.