Updated readme, manifests.

better naming of roles

Removed line breaks
Updated Readme.