lme4 1.0 compatibility
Merge branch 'master' of github.com:RGLab/SingleCellAssay

Conflicts:
	inst/tests/test-lrtest.R
	inst/tests/test-zeroinf.R