Close out develop branch.

Wanted to get this stuff onto `master` before I mothball that branch.