cleaned up include directory
Merge branch 'master' of https://github.com/allenh1/p2os