Merge pull request #23 from mqwilber/update_nbd_lt

Update nbd lt. Didn't thoroughly check over yet, but will do at our next code review.
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
Added variable printing in output
Merge branch 'develop' of github.com:mqwilber/macroeco into develop
Merge pull request #31 from mqwilber/develop
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
Bump year in LICENSE and give plain txt extension
Move py files to subdir to prepare for setuptools
Add basic setup.py
Correct two typos in empirical docstrings for Sphinx rendering
Update gitignore to only ignore generated docs
Add draft docs including themes, templates, extensions
Draft of new distributions2 module with tests