Adjustments to make code pass the specs.  Rakefile needs fixing as well.
Tidy up support files
generated new gemspec with 'rake gemspec' command