simplified version
mergejdflksjdf branch 'gh-pages' of github.com:CartoDB/torque into gh-pages