WIP.
WIP.

Merge branch 'master' of github.com:ska-sa/corr2

Conflicts:
	src/fxcorrelator.py
Merge branch 'master' of github.com:ska-sa/corr2
WIP.