CDB-1305 Refactor part 2, moved to named_map more stuff
Merge branch 'privacy-maps' of https://github.com/CartoDB/cartodb into privacy-maps