Patch everything together.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
	src/main/java/org/surgedev/patch/PatchedClassLoader.java
Stop coming back, Canary!