Updated readme so that changes can be made upstream, and merged downstream without conflicts.