Use Bundler gem tasks.
Merge pull request #140 from wvanbergen/use_bundler_gem_tasks

Use Bundler gem tasks
Fixed merge conflicts in gemspec