updates

- allow/deny list implemented - woop!
Merge branch 'master' into master.go
merge from master
revert commit
delete locally used file from git