Updated to latest

-location removed from qualified/disq
-tmobile history added to qualified/disq
-norcal/socal templates are matching