Having looked closer (nothing like a public post to cause you to read again and discover you were wrong) I see that I did change all those files in the glmms branch that Andreas changed in his pull request. I hadfixed the issue that Andreas addressed but in a different way and our changes were in conflict.
However, I am still in the position that I can't reconcile the glmms branch and the master branch.
