Some refactors.
Add Ruby 2.1.0 to .travis.yml