Replaced hack for settings dictionary with a new hack that preserves a value that has an overridden value set later
Work on fixing upload command to work with 1.5x architectures