Initial branch

@brettweavnet @thbishop somehow I messed up the other PR.

Can you take a look at this please?  I have completed initial testing with the resulting RPM on the CF templates.