more changes to try and fix heroku
Merge branch 'master' of heroku.com:thawing-beach-1139
Merge branch 'master' of https://github.com/verily-org/verily
changes to DB handling for heroku