bukkit and scala plugin!
Merge branch 'master' of https://github.com/bhudgeons/forsawcraften

Conflicts:
	server.properties
	world/data/villages.dat
	world/level.dat
	world/level.dat_old
	world/region/r.-1.0.mca
	world/region/r.-1.1.mca
	world/region/r.0.0.mca
	world/region/r.0.1.mca
	world/session.lock