initial commit
Merge branch 'icscf' of github.com:Metaswitch/sprout into icscf_out
Add local routing
Take out unwanted commit
Updates after review
Merge pull request #327 from Metaswitch/icscf_out

[Reviewer: Mike] Icscf out