Updates and tweaks to readme files
Resolving conflicts
Resolving conflicts