Added tests, diff improvement, Ruby 2.1.0 note

This collects the changes that seem to be worthwhile from Dealer.com's fork, because I waited too long to make a PR!