Options added to pad missing TCP data (making HTTP parsing more
robust), and allowing for a mismatch in HTTP response sizes and the
Content-Length header.

Conflicts:
	main.py
	settings.py
	tcp/direction.py

Andrew: re-arranged for PEP8, minor touchups.
Two small bugfixes:
  - Fix pad_missing_data when no chunks in a given flow
  - Allow ModifiedReader to read from a cStringIO object

Conflicts:
	tcp/direction.py
Make dependency on socket.inet_ntoa

Also delete useless vim swap file.
Fix name typos in tcp/packet.py: s/TCPPacket/Packet
Another typo from Matt Welsh: reponse is not a word.
Allow semicolons on end of media type

Also remove bad import from tcp/direction.py
Fix bad array check in dpkt_http_replacement.py

Thanks to Ethan Katz-Basset <ethankb@google.com>
Handle empty content type
Fix stale reference to debug_pkt_count in pcap.py
Ethan had the right idea about logging in tcp/direction.py

replace reference to logging with log, and remove import logging
at top.
Merge pull request #4 from ethankb/minor_fixes

Basically, just handling malformed content-length headers.
Instead of ethankb's exact solution, just catch ValueError
and log the invalid values.
Merge changes from Matt Welsh and Ethan Katz-Basset
Merge pull request #4 from ethankb/minor_fixes

Basically, just handling malformed content-length headers.
Instead of ethankb's exact solution, just catch ValueError
and log the invalid values.
Merge in fixes and tweaks to Matt's changes from Google.
Extra fixes to merged stuff from mdwelsh and ethankb
Move most pcap2har .py files into a library directory
Fix some relative imports for libification
add EasyParsePcap function to handle boilerplate.
Wide-ranging cleanup

Line-length <= 80 chars, blank lines between methods,
other whitespace changes, rephrase some comments,
s/"/'/, re-order some imports, etc.
Accept invalid media types with just a warning.