CDB-3096 More routes rewriting (halfway through API, pending all erb calls)
Merge branch 'CDB-2891' of https://github.com/CartoDB/cartodb into CDB-2891