Update versions.cfg
Commit local changes before merge
Refactor for new style theme resoruces
Add theme scaffolding based on jekyll templates