Update gemspec and general tidies