Updated to use Bundler & work on ruby 1.9