added default conf to nntpproxy.py
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev

Conflicts:
	misc/update_scripts/python_scripts/nntpproxy.py