Making tmp directory cross-platform
Merge branch 'master' of https://github.com/TehShrike/k

Conflicts:
	package.json