updated attribution information in README
Merge branches 'alistair' and 'master'