fixed makefile
fixed rendering when variables are used
Merge branch 'develop' of github.com:CartoDB/cartodb.js into develop