Michigan Gov. proposes boosting merit, cutting need-based aid