Preparing for 2.6.0 beta

[Joshua Root]

I think we're pretty close to being ready to make a new stable branch
and tag a beta. Clemens is going to make one more change related to
Xcode checking; are there any other changes that really need to go in
before the beta?

- Josh