Travis build on 2.0 and 2.1
Merge pull request #414 from nicolasblanco/travis21

Travis build on 2.0 and 2.1