Refactored how the tenant id is set and used
Merge pull request #3 from AuraEQ/tenantid-refactor

Refactored how the tenant id is set and used