beginning work once more
Merge branch 'master' of github.com:AsherGlick/Minecraft-Bukkit-Plugins