reserved keyword
removes duplicate service name from storage
sets service name on metadata if not set (fixes #111)
updates tests
Merge pull request #134 from basz/upstream/id

Upstream/id