CHanges required to compile on windows
Merge pull request #486 from rmcgibbo/windows-fixes

VS2008 (Windows) Fixes