Initial DerivedCharging loading
Updating after merge
Sample DerivedChargers.csv
Fixup tests
DerivedChargers into their own files in config package
Fixup SM parse time bug discovered by DigiDaz, adding some more tests
Adding caching for DerivedCharging settings
AddBalance expiration date accepting shortcuts
small fixes
Merge branch 'master' into console-ng