Updates to readme 

Renaming of features, cleanup of markdown etc