Merge pull request #98 from miks/master

Add Travis support for 2.1.1 and fix rbx failure
Merge pull request #99 from miks/master

Fix failing test on rubinius