Maintaining a long-running dev branch was unecessarily complex.

Move all the diffs from dev into master; blow away dev. Don't need its
history either.