Merge branch 'master' of github.com:dlebauer/rhwsd

Conflicts:
	R/hwsdquery.R
	inst/extdata/HWSD.sqlite
	inst/tests/test.extract.functions.R
	man/extract.box.Rd
	man/extract.latlon.Rd
Merge branch 'master' of github.com:dlebauer/rhwsd

Conflicts:
	R/hwsdquery.R
	man/extract.box.Rd
	man/extract.latlon.Rd