Merge pull request #291 from s0undt3ch/develop

Fix my mess
Making errors clearer
Merge pull request #292 from techhat/develop

Making errors clearer
Include cli options into loaded config dictionary.

The merge with cli mix in, only merges option keys which exist in both places, cli options and loaded config. Since neither `profile` not `parallel` existed in any of the default config dictionary, not the loaded config files, that info was not getting included.