Merge pull request #21 from justinmclean/master

Update, simplify and modernise policy