Rename vars
Merge branch 'CDB-1882' of github.com:CartoDB/cartodb into CDB-1882

* 'CDB-1882' of github.com:CartoDB/cartodb:
  added environment condition before rendering rollbar stuff