Style changes
Unifying require for formats
Unified naming for formats
Merge branch 'master' of https://github.com/CartoDB/CartoDB-SQL-API