Fix how swapped terms and deleted courses are handled. Changes should stick now.
Fix swap email message