rearrange deviance behaviour (working on #211)
Merge branch 'master' of ssh://github.com/lme4/lme4