Minor fix to usage example, --ipv4 & -t are mutually exclusive.
Added filter (-f) to only show IPv4, IPv6, or ASN.
Merge remote-tracking branch 'origin' into filter

Conflicts:
	blockfinder
Merged filter (-f) into the relevant options via opt callback.
Document new :type option for -t and -n.
Include a embedded copy of ipaddr. The license for ipaddr is found inside
the embedded_ipaddr directory.The embedded copy of ipaddr is only used
if the ipaddr module is not already available.
The embedded copy of ipaddr has been pulled from the ipaddr google code
git repository located at https://code.google.com/p/ipaddr-py/
at commit 8d1eeed6e9f61939fee65b78748248f17ce919e4 (commit date Jun 29, 2012).

Signed-off-by: David <db@d1b.org>
Usage examples updated
Merge pull request #55 from z05/filter

Usage example err, and filtering results
Merge pull request #57 from d1b/embedded_ipaddr_with_version

Include a embedded copy of ipaddr. The license for ipaddr is found insid...
Patch from Gisle Vanem to improve win32 support
Windows .bat file from Gisle Vanem
Add note in README about blockfinder.bat
Update default user agent to Tor Browser Bundle's current string.
Add '--what-country' option for the geographically illiterate.

 * Adds option '-w' or '--what-country to see a country's name and then
   exit. For the times when you do "blockfinder -4 <some IP address>" and you
   still have no clue what country it's in.
Merge pull request #59 from isislovecruft/develop

Add --what-country option.
update default User-Agent to match current TBB
Merge pull request #60 from leif/useragent

update default User-Agent to match current TBB