Facilitate customisable sflowtool options
Merge branch 'master' of https://github.com/inex/IXP-Manager into production
Merge branch 'master' of https://github.com/inex/IXP-Manager into production
revert changes
[HK] Complete changeset for @rowanthorpe pull request #37
Merge pull request #37 from rowanthorpe/master

Fix mistyped filename for template
Merge branch 'master' of https://github.com/inex/IXP-Manager into production
Fix variable typo.