(cm) win32 fixes
Merge branch 'master' of https://github.com/letoram/arcan
(cm) win32 builds back to normal