updated some readme stuff
Merge branch 'develop'