CHanges required to compile on windows
force upload
Merge pull request #487 from rmcgibbo/force-upload

force upload
Merge pull request #486 from rmcgibbo/windows-fixes

VS2008 (Windows) Fixes
update conda
Merge branch 'master' into appveyor