Minor tweaks.
Ensure Travis test latest 2.1.x.
Update README to reflect current branch etc.
Fix specs and update to RSpec 3.1.x