consolidate updates to lookup_controller because merge conflict
Prioritize ENV variables over CONFIG variables

Heroku did not have a CONFIG declared because there is no config.yml file
Therefore, it crashing before even defaulting to ENV.
However, ENV will always exist, and it's reasonable to try that path first
and then default to CONFIG. In fact, our app eventually will live on Heroku
moreso than on our local-hosts.
Merge pull request #106 from fence-lizards-2014/yelp_keys_env_vars_for_heroku

Setting Environment Variables for Heroku Deployment

go CJ!