fixed unit tests to account for the fact that we have two zoho accounts
Merge branch 'master' of https://github.com/Thinkful/pysplash