Upstream Merge

Updates to latest (Craft)Bukkit builds as of 19/01/14 at 01:00 UTC

Fixes several crash bugs which have been posted several times on the forums.