bugfixes
nothing important

Merge branch 'master' of https://github.com/hughjonesd/betr

Conflicts:
	inst/tests/tests.R