updated readme for cleaner merge
Merge branch 'master' into Chapman-Live