Implement Layer#base_layer? and Layer#data_layer?
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop