First pass of cleanup
Use the "Run Custom Tool" command

Now uses the "Run Custom Tool" command to avoid an unnecessary checkout
of the template file.
Renamed App.config