Fix bugs in scanonevar; input covariates as matrices rather than formulas
Merge branch 'devel' into scantwoperm