Removes unused code. Fixes failing spec
Fixes spec
Fixes spec
Merge branch 'master' into CDB-2773
Merge pull request #393 from CartoDB/CDB-2773

Fixes some tests