Merge pull request #15 from eatsafe-sa/travtex

ENV vars and DB fixes
Merge pull request #16 from eatsafe-sa/travtex

Fixed local env issues with environment vars
fixing home controller merge conflicts