Added a section in the Windows information re: which versions of the dependencies are packaged.
update Makefiles to include new files from CDF5 patch
Merge branch 'master' into CDF5
minor changes
add two c files generated from m4
minor changes