Sync Config Files (where appropriate)

I noticed that the configuration files in the master branch have diverged on some areas where they should be common.  I have left six commits on this new feature branch so you can see the steps I took to get to the final commit.

- jss