Most recent version I have.
Loading still not 100% complete, but is almost there. Charges are getting loaded and NET renamed to AverageNet for greater clarity
Revert "Most recent version I have."

This reverts commit 8a5c22e8b81088deee6515781102378da4fa8f3d.
Revert some changes in the object mappings - other work needs to be done to fix the duplicate key problem; Changed the output path of one test to the TestData directory; updating the mtdb test files.
Merge remote-tracking branch 'origin-github/master'
Merge branch 'master' into Sam's_Recommendations
-- Revert some changes in the object mappings - other work needs to be done to fix the duplicate key problem; Changed the output path of one test to the TestData directory; updating the mtdb test files.