Revert "Fix TCP OPTS and WIN size not being sent on non nmap-probe packets"

This reverts commit b92c482e18dd5649126fb82e312a39f8cc3572e9.
Merge branch 'integration' into scripts
SCRIPTS: convert output of snmpscrape to be a csv, fix integer problem

The integers within the restructured file were being encoded incorrectly
if they were negative or larger than two 7-bit bytes could contain 
(the reason for that is within the BER long form encoding documentation).
Thus, just prepended two zeros so that the integer will be parsed correctly.

Shifted output of snmpscrape.py to a comma-separated file. Going to 
move from explicit file read/manipulation in ipp.py to using the csv module
in the python std libs, eventually.

#50