Goldman raises short-term market outlook, but thinks stocks will be stuck for the rest of the year