README improvements
added git revisions to README.md
fixed conflict
Merge branch 'master' into stream