Add a wait for intermittent failure of test_edit_contact
Merge pull request #395 from bobsilverberg/edit_contact

Add a wait for intermittent failure of test_edit_contact