Fix include and require handling
Merge pull request #36 from djbobke/master

[bug] include and require have conflict in rules