Initial
Data dumper
Merge branch 'master' into merge

Conflicts:
	nbt/chunk.py
	scan.py
Merge upstream into merge (using imerge)
Fix merge bugs