Resolved conflicts: kept HEAD versions of QSS (has later refinements), InitGui.py (has newer origin architecture), and silo submodule.
Resolved conflicts: kept HEAD versions of QSS (has later refinements), InitGui.py (has newer origin architecture), and silo submodule.