travis added
Merge branches 'develop' and 'CDB-2959' of github.com:CartoDB/cartodb.js into CDB-2959
travis file touched