Revert "Merge pull request #10 from sanemat/feature/travis-use-2-1-0"

This reverts commit b5fe71f3e25cbd7ab78e3063d3a291a63b4a06ed, reversing
changes made to c0998452219a4644d9dd2feb69e0f2a9384981da.