The MSSM with Non-Universal Higgs Masses