more minor cleanup for final submission
Finish up README + final minor changes
fix README merge conflict
fix README spelling