Updated readme to match new stuff
Merge branch 'develop', remote branch 'origin/feature-update-readme' into release-2.0
Merge branch 'release-2.0' into develop