miscellaneous tweaks and improvements
Merge branch 'master' of github.com:concrete5/concrete5-5.7.0
Revert "Merge pull request #217 from Shotster/fix-permission-assignment"

This reverts commit 0388b66211b24d7a050247cfa52f1d69919609e2, reversing
changes made to 3b02af55269941ed9b192bebbc1b7b9205a781c5.