CDB-3240 basic model + spec in place
Merge branch 'CDB-2891' of https://github.com/CartoDB/cartodb into CDB-2891