Improved help
Only use one incoming port, much simpler that way
Merge branch 'dev'

Conflicts:
	cherrytorrent.py