time slider updated
Merge branch 'feature/CDB-363_torque_integration' of github.com:CartoDB/cartodb.js into feature/CDB-363_torque_integration