Add benchmark dependencies
Add 2.1.0 to travis
Small cleanup on travis file