Include reorg
Merge pull request #7 from ihnorton/patchset

WIP: linux patchset