Added fuel calculations for Websource.

This required a new charge called 'Aggregate' to be created. Enjoy!
Including files that were omitted last commit.
Merge branch 'add-fuel-supports' into working