Moved DerivedGeology class to GeoProps.hpp.

Also, it is no longer a template (but its constructor is).
ImpesTPFAAD is no longer a template class.
Moved implementation of class ImpesTPFAAD to separate file.

Also cleaned up header usage in ImpesTPFAAD.hpp, making some
new inclusions necessary in test program.