Remove default conflicts and include_docs to true on filter
Merge pull request #20 from adamshih/master

Remove default conflicts and include_docs to true on filter