Added update_subscriber and tests for it
Added commented out merge_lists - not working yet
Merge branch 'mail'