Fix ff of empirical to unix line endings, remove trailing whitespace
Fix line wrap
Move parse method of Patch up below init
Fix whitespace in test_empirical
Clarify meaning of spp_list in parse_criteria
Partial pair_dist method using pdist for low abundance species
Update pair_dist with while loop for points
Complete and tested o_ring method for Patch (formerly pair_dist)
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	empirical.py