Fixed problem with tipsy FINALLY
Merge branch 'CDB-4209' of github.com:CartoDB/cartodb into CDB-4209