Sorted out Gemfile, gemspec, Rakefile, etc.
Added some more ES tests.