Merge pull request #1 from jt6211/threatstream

Merging in conpot geoloc and user-management changes
Merge pull request #2 from jt6211/threatstream

added snort.alerts and its processing to geoloc
Merge pull request #3 from jt6211/threatstream

Threatstream
Merge pull request #4 from jt6211/threatstream

some bug fixes
Merge pull request #5 from jt6211/threatstream

fixed an issue with logging
Merge pull request #6 from jt6211/threatstream

hpfeeds to stdout, for debugging
Merge pull request #7 from jt6211/threatstream

added ability to log channel output
Update geoloc.json
Update processors.py
add support for amun honeypot
Create log_hpfeeds.py
Create example_publish.txt
Create log-hpfeeds.conf
Create README
Update geoloc.py
Update log_hpfeeds.py

tabs to spaces
Merge pull request #8 from tweemeterjop/patch-1

add support for amun honeypot
merged with master