updated db test GH #158
update settings tests GH #158
update utils tests GH #158
Merge branch 'master' into GH-158-update-tests

Conflicts:
	db/tests/testthat.R
more updates to tests #158
more cleanup
Merge remote-tracking branch 'origin/master' into GH-158-update-tests
fixes to biocro test

moved defaults folder back to inst/extdata/defaults
Merge remote-tracking branch 'origin/master' into GH-158-update-tests

Conflicts:
	db/tests/testthat/test.contents_sanity.R
Merge pull request #184 from PecanProject/GH-158-update-tests

Gh 158 update tests