Cleanup (fixes #22)

Oops, I seem to have made commits to this branch that were in the git pre-commit hook branch. Please ignore everything but the changes to bpContentPolicy, i'll try to figure out how to fix this.