Fix bugs uncovered in testing
Code review markups
Resolve issues from testing
Merge pull request #66 from Metaswitch/diameter_config

[Reviewer: Alex] Rely on common ralf/Homestead script to create freeDiameter config file