@tseaver @dhermes @jgeewax tell me what needs to be done.

The feature branch approach is not really working either.