Finished off official 1.7-Spigot-hack build

Signed-off-by: Irmo van den Berge <bergerkiller@gmail.com>