editing readme again, mostly tasks
Merge branch 'master' into sarah