GH #186 - Merge in user-defined config files under self.user_config.
Merge branch 'dsuch-f-gh186-user-conf'