distributed not needed anymore
updated manifest
Merge branch 'new_template_structure' of github.com:glastopf/conpot into new_template_structure