More minor cleanup...
Support for Ruby 2.1.x on Windows