Merge pull request #18 from Ecotrust/master

Initial changes to support forestplanner
error fixes
forestplanner script csv output
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'origin/master' into dataviz