Updated for new version of lme4.
Merge branch 'master' of https://github.com/gjm112/MixMAP