Tests for the ZipDataSource and additional config on EmailType.
Merge pull request #54 from markorchard/master

Additional tests for the ZipDataSource and associated configuration points