Remove 2.1.0 from .travis.yml
Merge pull request #31 from kubo39/Remove-2.1.0-from-travis

Remove 2.1.0 from .travis.yml
fix conflict