Fixes the gemspec email address
Merge branch 'master' into service-actions
Adds some specs for the service actions