Edit with Ian/Janet's comments.
Merge branch 'master' of https://github.com/ChandraCXC/iris-aandc-paper
Add more of Ian's comments. Fix-up typos.