Make apply patches target HEAD of upstream and squelch some fluff on applying.
Fix conflicts to update to latest Bukkit, yay fluff.
Better item merging
Add oreobfuscator by @lishid for Spigot. Please report bugs and use with caution until stability can be verified.
Fix obfuscator being a little too effective.
Notify all adjacent blocks, thanks Aikar
Switch to pwd so the scripts can work more reliably on other OSs
Check if chunk is loading before obfuscating.
Add @EddGruberman's patch to fix nether portals when the nether is disabled.
Reduce number of collision checks for living entities.
Update rebuildPatches to ignore git version string.
Move Spigot config initialization code into its own class, and use it for /reload.