tooltip working with alternative names
Merge branch 'CDB-2653' of github.com:CartoDB/cartodb.js into CDB-2653