Removing keyword "type" from storage.acl.
Using more descriptive entity_type instead of type_.
Merge pull request #156 from dhermes/fix-overloaded-keyword

Removing overloaded global "type" from storage.acl.