Committing changes for merge
Merge branch 'master' of https://github.com/weruder/pico-and-frens-bukkit