Updated to build on ruby 2.0.0, various cleanup.