Sprout init.d changes
Bono/sprout changes
improve usage statement
Update bono's init.d
Update bono.init.d to use --routing-proxy rather than --edge-proxy
Switch to using a features directory rather than a file
Merge remote-tracking branch 'origin/master' into sto552
Fix bug in init.d scripts
Markups
Merge remote-tracking branch 'origin/master' into sto552
Expunge remaining references to edge_proxy
Merge pull request #307 from Metaswitch/sto552

[Reviewer: Rob] Sto552