add source templates for s2i, rename binary ones, update inventory

[sherl0cks]

It's possible that this will break folks consuming our templates, but that's why you need to use tags... Merging.