Properly initialize CartoDB config for vizzjson. Fix query for base layers
Merge branch '2.1' of github.com:CartoDB/cartodb20 into 2.1