few changes

Signed-off-by: Delian Delchev <delian.delchev@gmail.com>
Merge branch 'master' of https://github.com/delian/sflow-collector

Signed-off-by: Delian Delchev <delian.delchev@gmail.com>

Conflicts:
	package.json