Merge branch 'master' of https://github.com/Protovision/io-lua

Conflicts:
	code/sys/apple.c
	code/sys/windows.c