Change generic_conf_diameterconf file to work for incoming connections from peers being allowed or disallowed
Make small changes to usage and comments
Merge pull request #84 from Metaswitch/Cedar_Changes_Try

[Andy] Change generic_conf_diameterconf file to work for incoming connections f...
Use correct name
Merge pull request #85 from Metaswitch/wrong_name

[Reviewer: Alex] Use correct name