update to world. sheep are almost ready
Merge remote-tracking branch 'origin/master'

Conflicts:
	logs/2014-06-16-3.log.gz
	logs/latest.log
	server.properties
	world/DIM-1/region/r.-1.-1.mca
	world/DIM-1/region/r.-1.0.mca
	world/DIM-1/region/r.0.-1.mca
	world/DIM-1/region/r.0.0.mca
	world/data/idcounts.dat
	world/data/map_14.dat
	world/data/villages.dat
	world/level.dat
	world/level.dat_old
	world/playerdata/47e6b2ea-e06c-3096-8f3a-fe654130c2e3.dat
	world/region/r.-1.-1.mca
	world/region/r.-1.0.mca
	world/region/r.-1.1.mca
	world/region/r.-2.-1.mca
	world/region/r.-2.0.mca
	world/region/r.-2.1.mca
	world/region/r.0.-1.mca
	world/region/r.0.0.mca
	world/region/r.0.1.mca
	world/session.lock
	world/stats/47e6b2ea-e06c-3096-8f3a-fe654130c2e3.json