CDB-2050 coding style changes
Merge branch 'CDB-2050' of https://github.com/CartoDB/cartodb into CDB-2050