small changes to get old FFTW and ZLIB to compile
Merge branch 'master' of github.com:yiuin/npl

Conflicts:
	lib/nplio.cpp