clean up acl
Merge pull request #897 from Singly/cleaner-acl

clean up acl
Merge branch 'master' into cleaner

Conflicts:
	hallwayd.js
	lib/acl.js