Fix secure connections
Reinstate debian/source/format
Merge pull request #56 from Metaswitch/secure-connections

[Reviewer: Andy] Fix secure connections