Add the ability to define the network type for Issue #539
Merge branch 'dev' into issue_539

Conflicts:
	plugins/tcp/tcp_input.go
	plugins/tcp/tcp_input_test.go
Update docs, add tests
Merge pull request #687 from mozilla-services/issue_539

Issue 539