improve doc for options(lmerControl=...)
Merge branch 'master' of ssh://github.com/lme4/lme4