Readme cleanup. Ready for submit
Resolved conflict