Cleaning up few inconsistencies in tests, simplified service definitions, simplified generator logic
Merge pull request #2 from Ocramius/hotfix/github-bundle-cleanups

Cleaning up few inconsistencies in tests, simplified service definitions, simplified generator logic