small stuff mostly due to documentation.
something odd is going on.
another odd thing
Removed tempfile() from population_map() to be able to work with newer get_map() functionality and resolve problem in github.
?  lot of .Rproj stuff that should be ignored
?  lot of .Rproj stuff that should be ignored
more crap

Merge branch 'develop' of https://github.com/dyerlab/gstudio into develop

Conflicts:
	.Rproj.user/A5EA2B90/pcs/files-pane.pper
	.Rproj.user/A5EA2B90/pcs/windowlayoutstate.pper
	.Rproj.user/A5EA2B90/sdb/prop/INDEX
Odd junk is showing up.  .gitignore may not be working correctly.
cleaning up .Rproj.user
deleting stuff
Deleting lots of .Rproj.user stuff
Clean up gitignore

trying to fix the gitignore stuff fixed up.
cleaning up still
cleaning up old genetic_structure class
trying to clean up this mess

Merge branch 'develop'

Conflicts:
	DESCRIPTION
	NEWS
	R/parent_finder.R
	inst/tests/test-bad_parents.R
	inst/tests/test-parent_finder.R
	man/as.data.frame.genetic_structure.Rd
	man/parent_finder.Rd
	man/pies_on_map.Rd
	man/plot.data.frame.Rd
	man/strata_coordinates.Rd