Fix issues about missing zc.buildout egg
Merge pull request #36 from Metaswitch/egg_fixes

[Reviewer: Andy] Fix issues about missing zc.buildout egg