Major updates to replication
Merge pull request #13 from lukecampbell/emails

Major updates to replication