Use CraftBukkit GSON, include Jedis in shaded jar.
Fix merge conflicts