Fix bug overriding default options in config

When merging config.defaults with an action-specific config (e.g. config.create), the merge was done in the wrong order, thus causing the defaults to override the action-specific values. Added tests and fixed bug.