Add header IDs
Remove dependency on gpioutil
Merge commit