An increase in U.S. military forces in the Arab Gulf along with a prisoner swap for frozen assets have recently outlined U.S.-Iranian relations, raising the question of whether the relationship between the U.S. and Iran is getting more dangerous or less so? At the very least, these are the latest wrinkles in a complicated history between the two countries and hopefully accidental or intentional conflict in the region can be avoided.