Adding support for user defined option overrides in a User settings file or project settings file. Also corrected a few minor mistakes.