Merge pull #1 and #3, use modified #2

I think the spirit of pull #2 does fix the bug. I've changed the code more to accommodate it. Also locks down the console commands with bukkit permissions (in addition to the existing Player object check).

As this merges pulls #1, #2, and #3, those can be closed as only this needs to be accepted. Thanks guys!