minor fixes
Merge branch '2.1' of github.com:CartoDB/cartodb.js into 2.1