Merge pull request #123 from jpecht/master

crosswalk work / minor structure update
Merge pull request #124 from jpecht/master

fixed error from last commit
added "Body of Water" data for categorical view
changed "Interests on Debt" to "Interest on Debt"
crosswalk updates
crosswalk additions
checks for crosswalk
Merge remote-tracking branch 'upstream/master'