Revert out of scope formatting tweaks
Expand description of addPermissions method
Merge branch 'master' into permissions-changes

Conflicts:
	src/main/java/org/bukkit/permissions/PermissionAttachment.java

Adjusted line breaks on javadoc