Functional Ecology non-review, per FogBugz 6683
Merge pull request #271 from datadryad/integration

Functional Ecology non-review, per FogBugz 6683