enable includes, break content into includes
Merge pull request #45 from orchestrate-io/includes

enable includes, break content into includes
Rebase and clarify where the generted key is