Added conf inheritance
Merge pull request #1290 from psav/conf_insanity

Conf craziness - Inheritance