Supressions
Handle CommandException

Changed code to handle CommandExceptions:
http://jd.bukkit.org/rb/apidocs/org/bukkit/command/CommandException.html
Merge branch 'master-2'