It may have taken an executive order, but President Barack Obama seems to have headed off a dispute between the City of Austin and Travis County. The long-standing controversy involving Sheriff Greg Hamilton’s participation in the Immigration and Customs Enforcement’s…