Added ellipse->line and ellipse->point collision methods