More conversion, added next_term and previous_term methods to SchoolTerm and an option to return terms as SchoolTerm