State rewrites master plan, goals for public colleges