added custom formatter to torque slider
Merge branch 'develop' of github.com:CartoDB/cartodb.js into develop
added time slider example
Merge branch 'develop' of github.com:CartoDB/cartodb.js into develop