Merge branch 'master' of https://github.com/antiphon/spatstat

Conflicts:
	R/logistic_vb.R
Merge branch 'master' of https://github.com/antiphon/spatstat