Config loading refactored

Addresses issue #27.