Revert of previous commit

Misread error and updated code incorrectly.
removed out of date specs #4567

As the disposition code is always nil for ContactsController
with the change for #4567 these specs are no longer testing
anything useful. In fact they are wrong so removing them.
added events to pre population event list #4568
Merge pull request #264 from NUBIC/assessment_features_4568_tracing_workarounds_per_FSM_No_2013_14

Added events to pre population event list #4568
Merge branch 'develop' into 3285-eventless_contacts

Conflicts:
	spec/controllers/contacts_controller_spec.rb