Tweaks necessary to build 32-bit and 64-bit versions of Correlator on Windows
Merge branch 'master' of git://github.com/corewall/correlator

Conflicts:
	app/py_func.cpp