10gbe details from config, remove feng_sim flag
Config files for debug in debug folder
Merge branch 'master' of github.com:ska-sa/corr2

Conflicts:
	src/fxcorrelator.py