Listen on 127.0.0.1 or ::1 as well as the main address
Add missing #include
Merge branch 'master' into make_timers_redundant
Code review feedback
Merge remote-tracking branch 'origin/make_timers_redundant' into make_timers_redundant
Merge pull request #130 from Metaswitch/make_timers_redundant

[Reviewer: Andy] Make timers redundant