Moves the FuelHandler to MapKey
Merge pull request #549 from hilburn/master

Moves the FuelHandler to MapKey