Cleanup based on PR feedback

More updates from PR feedback

Moved config file logic before parse (actually does a second parse), so
that the config file is the default which is overridden by the command
line, instead of vice versa.

Also changed tabs to spaces

More spaces->tabs

Whoops fixed logic