Incorporate ovocean's updates, plus fix for bad bookshelf ID
Incorporate ovocean's updates, plus fix for bad bookshelf ID

webbukkit/dynmap,webbukkit/dynmap,webbukkit/dynmap,KovuTheHusky/dynmap,mg-1999/dynmap,webbukkit/dynmap