Connecting The Dots: Combining Points And Lines For More Robust And Accurate Local Features