CLI's master2

[Andrew Grieve]

I feel that having master2 around is now causing us more harm than would be
done if we just merged it into master. I'd like to merge it into master,
delete master2, and move on.