Upstream merge
Fix a possible error with links
Fix TNT crashing servers when breaking item frames
Fix the "Faster UUID for entities" patch (Fixes #81)
Upstream merge
Bring bungee support back in line with what the protocol update had
Fix Orebfuscator
Fix new lines break URL matching
Pop anti xray patch to top
Split out the configuration of engine modes 1 and 2 to eliminate the block lag seen when mining stone or wood and using engine mode 1.

Now we maintain a new list of blocks to replace with ores in engine mode 2, to ensure that we only update when players mine blocks that are potentially not an ore. We could perhaps even elimate this slight lag from mode 2 by reducing the need for calling update(x,y,z)
Optimize DataWatcher

Use primitive orientated collections, as well as more effective copies across collections.
Allow Disabling Zombie Villager Agression.

Useful for larger servers who want a nice performance boost at the expense of a little bit of gameplay mechanic changes. I believe this brings the mechanics of zombie vs villager back in line with 1.5.
*aggression
Configurable Amount of Netty Threads, defaulting to 4

This brings back the option that the Spigot version of netty saw. By default Netty will try and use cores*2 threads, however if running multiple servers on the same machine, this can be too many threads. Additionally some people have 16 core servers. If 32 Netty threads are allowed in this setup, then the lock contention, and thus blocking between threads becomes much greater, leading to decreased performance.
Prevent Mineshaft Structure Saving.

There is very little reason to keep track of Mineshafts as the only persistent behaviour within them is through the use of mob spawners, which are of course stored within the map itself. As such we can disable them from being saved, indefinitely, until there is reason to do so.
Merge in some stuff
Add an attempt at backwards compatability for (broken) NMS plugins. Also set negative no entry values as these cannot occur.

cc @aadnk
Don't box / rebox on object addition
Delay creation of serverconnection until needed so that our settings can take effect.
Allow Bungee to pass through UUIDs. This will be added to bungee in a few days, so people get a chance to update Spigot first.