master vs updated branches?

[dmcglinn]

Need to check which branch is the most relevant for updates. A quick look at the commit history of both branches suggests this isn't necessary straightforward.