Ruby 2.1 support  in tests, gem generation

+ merge from some forks