Redesign merged

[robertbur...@gmail.com]

The redesign branch has now been merged into trunk. I've run
comparative reports against several saved incubator release candidates
and it seems to be functionally identical.