Merge pull request #18 from Ecotrust/master

Initial changes to support forestplanner
error fixes
Merge remote-tracking branch 'upstream/master'