fix bootMer for "snow"-like parallelization
bootMer: simplify ffun definition

Merge branch 'master' of https://github.com/lme4/lme4

Conflicts:
	R/bootMer.R