2 commits included in this pull request I hope

Went to commit and push changes, once committed a new set of files appeared so I committed those as well.  Hope this pull includes everything!