Twitter categories set by number and not by 'Category X'
Merge branch 'CDB-3685' of github.com:CartoDB/cartodb into CDB-3685