Fiddle around with code inspection a bit
Tweak inspection rules some more, reduce inversions
Merge branch 'master' into bukkit-1.7.2