Updating permissions for consistency.
Fixing merge conflicts
Merge pull request #442 from Glitchfinder/master

Updating permissions to be more consistent.