Worldgen now done with simplex noise
Merge branch 'master' of https://github.com/fredley/incraftmental

Conflicts:
	js/world.js