delete acl

to allow merge to work
Merge COnflict
Fixes from force commit

forcing is bad, dontchaknow
Merge pull request #157 from amanda-abg/master

Fixes from force commit