Refactored ConfigFile class so that it is no longer a singleton
Fixes bug #4123 Double config including