Stocks rise as oil falls on optimism over Iran deal