Collapsed workflow submodule component into parent; added conditionals.
Merge pull request #24 from amcgowanca/collapse

Collapsed workflow submodule component into parent; added conditionals.