Github 60

Branch github-60 contains cherry-picked commits that resolve most of the issues from github #60. I didn't fix zlib as suggested, because I rolled my own and it seems fine linking against zlib made with cmake on windows for the same CMAKE_GENERATOR.

It includes a renamed document, because it looks like that was originally intended.