Ruby 2.1.2 fixes

Cleanup for Ruby 2.1.2. Everything seems to be working without errors or warnings EXCEPT #34, which is sporadic.