Combine settlement and resource algorithms
Merge pull request #11 from mcruthven/master

Combine settlement and resource algorithms