better file naming and updated makefile
Merge branch 'master' of https://github.com/databrary/policies
merge