Metrics revamp: removes and adds some metrics
Merge pull request #172 from CartoDB/CDB-3659

Metrics revamp: removes and adds some metrics