fix for finding cython.bat
Added some windows building helping
Merge remote-tracking branch 'upstream/staging' into staging
Fixed style errors and cleaned up.