Should be in singular.
Ensure Travis test latest 2.1.x.
Update README to reflect current branch etc.
Tweak spec support for master branch.

Update dependencies and syntax etc and hopefully it will give less
random failures.