Non-Discriminatory Machine Learning Through Convex Fairness Criteria