Merge pull request mrlesmithjr#13 from mrlesmithjr/mrlesmithjr/issue1…

…2_Refactor-for-latest-Cookiecutter-template

Mrlesmithjr/issue12 refactor for latest cookiecutter template