removed unnecessary commented code + fixed problem with set_active_layer_id when a new layer is added
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop