Adjustments to permission system to handle composite keys during permission checks
Merge branch 'master' of github.com:dieselmachine/baph