Git is maddening sometimes.

Merging David's master with my fork.