fix translation issues on windows
Merge remote-tracking branch 'origin/master' into tim/windows
Merge remote-tracking branch 'origin/master' into tim/windows

Conflicts:
	topaz/main.py
Merge remote-tracking branch 'origin/master' into tim/windows

Conflicts:
	topaz/main.py
refactor platform detection
Merge remote-tracking branch 'origin/master' into tim/windows

Conflicts:
	topaz/main.py
	topaz/utils/glob.py
Merge branch 'master' into tim/windows

Conflicts:
	topaz/main.py
	topaz/modules/kernel.py
	topaz/objects/fileobject.py
	topaz/system.py
fix annotation on windows
fix rtyping on windows
fix fork test
nudge travis
Merge branch 'master' into tim/windows

Conflicts:
	topaz/objects/fileobject.py
Merge remote-tracking branch 'origin/master' into tim/windows
nits
explicitely check if int fits into fixnum
Merge remote-tracking branch 'origin/master' into tim/windows
forgotten import
Merge pull request #326 from topazproject/tim/windows

Fix translation issues on windows
Merge remote-tracking branch 'upstream/master' into mbh/buffered-diskio-stream