Added key attribute to Role and Permission
Renamed Permission.display_name to .name
This way Roles can be identified much better
Merge branch 'master' of github.com:ohartl/entrust
Added possibility to find EntrustRole and EntrustPermission not only via id but also via key