updated doc with some sql and cartocss specs
fixed shadowed variable
removed unnused code
Merge branch 'develop' of github.com:CartoDB/cartodb.js into develop