Improved Performances and Motivation in Intelligent Tutoring Systems: Combining Machine Learning and Learner Choice