Merge README changes from master

Made a few changes to the Readme in master, need to add to develop as well.