The effect of the Δ(1236) in the two-nucleon problem and in neutron matter