diff --git a/.emacs.d/auto-save-list/.saves-10948-JOHNDOTY-1~ b/.emacs.d/auto-save-list/.saves-10948-JOHNDOTY-1~
deleted file mode 100644
index d307dca..0000000
--- a/.emacs.d/auto-save-list/.saves-10948-JOHNDOTY-1~
+++ /dev/null
@@ -1,32 +0,0 @@
-c:/src/xonline/private/setup/octopus/xdl/definition/topologies/expanded.xml
-c:\src\xonline\private\setup\octopus\xdl\definition\topologies\#expanded.xml#
-c:/src/AutopilotService/autopilotService/Co1PPE/xboxprime-test-co1ppe/deployment.ini
-c:\src\AutopilotService\autopilotService\Co1PPE\xboxprime-test-co1ppe\#deployment.ini#
-c:/src/xonline/private/setup/octopus/xdl/definition/components/misc/AutopilotSpecific.xml
-c:\src\xonline\private\setup\octopus\xdl\definition\components\misc\#AutopilotSpecific.xml#
-c:/src/xonline/private/setup/octopus/xdl/definition/topologies/Sandbox.xml
-c:\src\xonline\private\setup\octopus\xdl\definition\topologies\#Sandbox.xml#
-c:/src/xonline/private/setup/octopus/xdl/definition/environments/xboxprime.xml
-c:\src\xonline\private\setup\octopus\xdl\definition\environments\#xboxprime.xml#
-c:/src/xonline/private/setup/octopus/xdl/definition/environments/sandbox.xml
-c:\src\xonline\private\setup\octopus\xdl\definition\environments\#sandbox.xml#
-c:/src/newcommerce/Tools/xdlc/Main/private/src/xdlc/AutopilotSupport.psm1
-c:\src\newcommerce\Tools\xdlc\Main\private\src\xdlc\#AutopilotSupport.psm1#
-c:/src/xonline/private/setup/octopus/xdl/definition/components/database/npdb.xml
-c:\src\xonline\private\setup\octopus\xdl\definition\components\database\#npdb.xml#
-c:/src/xonline/private/setup/octopus/xdl/definition/components/common/ConfigureServer.xml
-c:\src\xonline\private\setup\octopus\xdl\definition\components\common\#ConfigureServer.xml#
-c:/users/johndoty/documents/WindowsPowerShell/Profile.ps1
-c:\users\johndoty\documents\WindowsPowerShell\#Profile.ps1#
-c:/src/commerce/PurchaseService/private/shared/timers/src/Microsoft/IEB/CommercialServices/Timers/TimerProcessor.cs
-c:\src\commerce\PurchaseService\private\shared\timers\src\Microsoft\IEB\CommercialServices\Timers\#TimerProcessor.cs#
-c:/src/AutopilotService/autopilotService/Co1PPE/xboxprime-test-co1ppe/Environment.ini
-c:\src\AutopilotService\autopilotService\Co1PPE\xboxprime-test-co1ppe\#Environment.ini#
-c:/src/AutopilotService/autopilotService/Co1PPE/xbox-Test-co1ppe/Environment.ini
-c:\src\AutopilotService\autopilotService\Co1PPE\xbox-Test-co1ppe\#Environment.ini#
-c:/temp/zomgout/AutoXOnline/xboxprime/servicemap.ini
-c:\temp\zomgout\AutoXOnline\xboxprime\#servicemap.ini#
-c:/src/xonline/private/setup/octopus/xdl/definition/components/common/WebstoreClient.xml
-c:\src\xonline\private\setup\octopus\xdl\definition\components\common\#WebstoreClient.xml#
-c:/src/AutopilotService/autopilotService/Co1PPE/xboxprime-test-co1ppe/machines.csv
-c:\src\AutopilotService\autopilotService\Co1PPE\xboxprime-test-co1ppe\#machines.csv#
diff --git a/.emacs.d/auto-save-list/.saves-11488-JOHNDOTY-1~ b/.emacs.d/auto-save-list/.saves-11488-JOHNDOTY-1~
new file mode 100644
index 0000000..757203f
--- /dev/null
+++ b/.emacs.d/auto-save-list/.saves-11488-JOHNDOTY-1~
@@ -0,0 +1,8 @@
+c:/src/xonline/private/setup/Autopilot/NpdbBootstrap/SetupNpdb.ps1
+c:\src\xonline\private\setup\Autopilot\NpdbBootstrap\#SetupNpdb.ps1#
+c:/src/xonline/private/setup/Autopilot/NpdbBootstrap/NpdbUtils.psm1
+c:\src\xonline\private\setup\Autopilot\NpdbBootstrap\#NpdbUtils.psm1#
+c:/src/iebsilver/AutopilotService/BLULab/Prime-Pvt-BluLab/machines.csv
+c:\src\iebsilver\AutopilotService\BLULab\Prime-Pvt-BluLab\#machines.csv#
+c:/src/iebsilver/AutopilotService/BLULab/Prime-Pvt-BluLab/xonline.ini
+c:\src\iebsilver\AutopilotService\BLULab\Prime-Pvt-BluLab\#xonline.ini#
diff --git a/.emacs.d/auto-save-list/.saves-1160-JOHNDOTY-1~ b/.emacs.d/auto-save-list/.saves-1160-JOHNDOTY-1~
new file mode 100644
index 0000000..df09802
--- /dev/null
+++ b/.emacs.d/auto-save-list/.saves-1160-JOHNDOTY-1~
@@ -0,0 +1,2 @@
+c:/Users/JohnDoty/Documents/Visual Studio 2010/Projects/IEBService21/.gitignore
+c:\Users\JohnDoty\Documents\Visual Studio 2010\Projects\IEBService21\#.gitignore#
diff --git a/.emacs.d/auto-save-list/.saves-14332-JOHNDOTY-1~ b/.emacs.d/auto-save-list/.saves-14332-JOHNDOTY-1~
new file mode 100644
index 0000000..1aaa5e1
--- /dev/null
+++ b/.emacs.d/auto-save-list/.saves-14332-JOHNDOTY-1~
@@ -0,0 +1,2 @@
+c:/users/johndoty/documents/Visual Studio 2010/Projects/IEBService21/IEBService21/src/TheServiceFD/Program.cs
+c:\users\johndoty\documents\Visual Studio 2010\Projects\IEBService21\IEBService21\src\TheServiceFD\#Program.cs#
diff --git a/.emacs.d/auto-save-list/.saves-14780-JOHNDOTY-1~ b/.emacs.d/auto-save-list/.saves-14780-JOHNDOTY-1~
new file mode 100644
index 0000000..7fa4182
--- /dev/null
+++ b/.emacs.d/auto-save-list/.saves-14780-JOHNDOTY-1~
@@ -0,0 +1,48 @@
+c:/src/AutopilotService/autopilotService/Co1PPE/xboxprime-test-co1ppe/deployment.ini
+c:\src\AutopilotService\autopilotService\Co1PPE\xboxprime-test-co1ppe\#deployment.ini#
+c:/src/xonline/private/setup/octopus/xdl/definition/topologies/Sandbox.xml
+c:\src\xonline\private\setup\octopus\xdl\definition\topologies\#Sandbox.xml#
+c:/src/newcommerce/Tools/xdlc/Main/private/src/xdlc/AutopilotSupport.psm1
+c:\src\newcommerce\Tools\xdlc\Main\private\src\xdlc\#AutopilotSupport.psm1#
+c:/src/xonline/private/setup/octopus/xdl/definition/components/common/ConfigureDTC.xml
+c:\src\xonline\private\setup\octopus\xdl\definition\components\common\#ConfigureDTC.xml#
+c:/src/xonline/private/setup/octopus/xdl/definition/components/common/ConfigureSgServer.xml
+c:\src\xonline\private\setup\octopus\xdl\definition\components\common\#ConfigureSgServer.xml#
+c:/src/xonline/private/tools/wstrunner/core/WmoDeployment.cs
+c:\src\xonline\private\tools\wstrunner\core\#WmoDeployment.cs#
+c:/src/xonline/private/tools/wstrunner/core/Deployment.cs
+c:\src\xonline\private\tools\wstrunner\core\#Deployment.cs#
+c:/src/xonline/private/msi/esp/xbltools/livetools/wxs/Microsoft.Ems.Tools.LiveTools.wxs
+c:\src\xonline\private\msi\esp\xbltools\livetools\wxs\#Microsoft.Ems.Tools.LiveTools.wxs#
+c:/src/xonline/private/setup/octopus/xdl/definition/topologies/expanded.xml
+c:\src\xonline\private\setup\octopus\xdl\definition\topologies\#expanded.xml#
+c:/src/xonline/private/setup/octopus/xdl/definition/components/misc/AutopilotSpecific.xml
+c:\src\xonline\private\setup\octopus\xdl\definition\components\misc\#AutopilotSpecific.xml#
+c:/src/xonline/private/setup/octopus/xdl/definition/components/common/ConfigurePrereqs.xml
+c:\src\xonline\private\setup\octopus\xdl\definition\components\common\#ConfigurePrereqs.xml#
+c:/src/xonline/private/msi/esp/xbltools/xbltools.wxi
+c:\src\xonline\private\msi\esp\xbltools\#xbltools.wxi#
+c:/src/xonline/private/msi/esp/xbltools/livetools/sources
+c:\src\xonline\private\msi\esp\xbltools\livetools\#sources#
+c:/src/xonline/private/msi/common/CommonDeployment/CommonHeader.wxi
+c:\src\xonline\private\msi\common\CommonDeployment\#CommonHeader.wxi#
+c:/src/commerce/Main/private/tools/ZestDeploymentGenerator/Powershell/FrontDoorPrerequisitesModule.psm1
+c:\src\commerce\Main\private\tools\ZestDeploymentGenerator\Powershell\#FrontDoorPrerequisitesModule.psm1#
+c:/src/commerce/Main/private/tools/ZestDeploymentGenerator/Powershell/FrontDoorPostrequisitesModule.psm1
+c:\src\commerce\Main\private\tools\ZestDeploymentGenerator\Powershell\#FrontDoorPostrequisitesModule.psm1#
+c:/src/commerce/Main/private/service/zest-commerce/src/bllcommerce/LiveCacheHealthCheckProvider.cs
+c:\src\commerce\Main\private\service\zest-commerce\src\bllcommerce\#LiveCacheHealthCheckProvider.cs#
+c:/src/xonline/private/setup/Autopilot/NpdbBootstrap/Bootstrap.sql
+c:\src\xonline\private\setup\Autopilot\NpdbBootstrap\#Bootstrap.sql#
+c:/src/xonline/private/setup/Autopilot/XOnlineLocalWatchdog/XOnlineLocalWatchdog.ps1
+c:\src\xonline\private\setup\Autopilot\XOnlineLocalWatchdog\#XOnlineLocalWatchdog.ps1#
+c:/src/xonline/private/common/xmgmtlib/xmgmt.cpp
+c:\src\xonline\private\common\xmgmtlib\#xmgmt.cpp#
+c:/src/xonline/private/common/config/config/ConfigAttribute.cs
+c:\src\xonline\private\common\config\config\#ConfigAttribute.cs#
+c:/src/xonline/private/common/config/config/ConfigInstance.cs
+c:\src\xonline\private\common\config\config\#ConfigInstance.cs#
+c:/src/xonline/private/common/config/config/ConfigEventLogger.cs
+c:\src\xonline\private\common\config\config\#ConfigEventLogger.cs#
+c:/temp/foo.txt
+c:\temp\#foo.txt#
diff --git a/.emacs.d/auto-save-list/.saves-14968-JOHNDOTY-1~ b/.emacs.d/auto-save-list/.saves-14968-JOHNDOTY-1~
new file mode 100644
index 0000000..3f5aefd
--- /dev/null
+++ b/.emacs.d/auto-save-list/.saves-14968-JOHNDOTY-1~
@@ -0,0 +1,20 @@
+c:/src/xonline/private/setup/octopus/xdl/definition/topologies/expanded.xml
+c:\src\xonline\private\setup\octopus\xdl\definition\topologies\#expanded.xml#
+c:/src/xonline/private/setup/Autopilot/NpdbBootstrap/ApplyNpdbSettings.ps1
+c:\src\xonline\private\setup\Autopilot\NpdbBootstrap\#ApplyNpdbSettings.ps1#
+c:/src/xonline/private/setup/Autopilot/NpdbBootstrap/Bootstrap.sql
+c:\src\xonline\private\setup\Autopilot\NpdbBootstrap\#Bootstrap.sql#
+c:/src/xonline/private/setup/Autopilot/NpdbBootstrap/Bootstrap.ps1
+c:\src\xonline\private\setup\Autopilot\NpdbBootstrap\#Bootstrap.ps1#
+c:/src/AutopilotService/autopilotService/Co1PPE/xbox-Test-co1ppe/Environment.ini
+c:\src\AutopilotService\autopilotService\Co1PPE\xbox-Test-co1ppe\#Environment.ini#
+c:/src/xonline/private/setup/octopus/xdl/definition/Properties.xml
+c:\src\xonline\private\setup\octopus\xdl\definition\#Properties.xml#
+c:/src/xonline/private/setup/octopus/xdl/definition/installsteps/ConfigureVIP.xml
+c:\src\xonline\private\setup\octopus\xdl\definition\installsteps\#ConfigureVIP.xml#
+c:/temp/zomgout/AutoXOnline/Expanded/ActiveAuth/ActiveAuthModule.psm1
+c:\temp\zomgout\AutoXOnline\Expanded\ActiveAuth\#ActiveAuthModule.psm1#
+c:/temp/zomgout/AutoXOnline/Expanded/ActiveAuth/ConfigureVIPModule.psm1
+c:\temp\zomgout\AutoXOnline\Expanded\ActiveAuth\#ConfigureVIPModule.psm1#
+c:/src/newcommerce/Tools/xdlc/Main/private/src/xdlc/AutopilotSupport.psm1
+c:\src\newcommerce\Tools\xdlc\Main\private\src\xdlc\#AutopilotSupport.psm1#
diff --git a/.emacs.d/auto-save-list/.saves-2188-JOHNDOTY-1~ b/.emacs.d/auto-save-list/.saves-2188-JOHNDOTY-1~
new file mode 100644
index 0000000..d56aa7b
--- /dev/null
+++ b/.emacs.d/auto-save-list/.saves-2188-JOHNDOTY-1~
@@ -0,0 +1,30 @@
+c:/src/iebsilver/AutopilotService/BLULab/Prime-Pvt-BluLab/xonline.ini
+c:\src\iebsilver\AutopilotService\BLULab\Prime-Pvt-BluLab\#xonline.ini#
+c:/src/xonline/private/setup/octopus/xdl/definition/topologies/expanded.xml
+c:\src\xonline\private\setup\octopus\xdl\definition\topologies\#expanded.xml#
+//determinist/share/johndoty/expanded/AutoXOnline.224.PrivateCatalog.000/servicemap.ini
+\\determinist\share\johndoty\expanded\AutoXOnline.224.PrivateCatalog.000\#servicemap.ini#
+c:/src/iebsilver/AutopilotService/BLULab/Prime-Pvt-BluLab/deployment.ini
+c:\src\iebsilver\AutopilotService\BLULab\Prime-Pvt-BluLab\#deployment.ini#
+c:/src/newcommerce/Tools/xdlc/Main/private/src/xdlc/AutopilotSupport.psm1
+c:\src\newcommerce\Tools\xdlc\Main\private\src\xdlc\#AutopilotSupport.psm1#
+c:/src/xonline/private/developer/johndoty/settings.ps1
+c:\src\xonline\private\developer\johndoty\#settings.ps1#
+c:/src/xonline/public/ext/tools/x86/ADTScript.ps1
+c:\src\xonline\public\ext\tools\x86\#ADTScript.ps1#
+c:/src/xonline/public/ext/tools/x86/ADT/ADTTools.ps1
+c:\src\xonline\public\ext\tools\x86\ADT\#ADTTools.ps1#
+c:/temp/foo.txt
+c:\temp\#foo.txt#
+c:/src/xonline/private/setup/octopus/xdl/definition/components/database/CatalogDb.xml
+c:\src\xonline\private\setup\octopus\xdl\definition\components\database\#CatalogDb.xml#
+c:/src/newcommerce/Tools/xdlc/Main/private/src/xdlc/ConsumeService.ps1
+c:\src\newcommerce\Tools\xdlc\Main\private\src\xdlc\#ConsumeService.ps1#
+c:/temp/buildap.bat
+c:\temp\#buildap.bat#
+c:/temp/zomgout/Expanded/Npdb/ServiceConfig.ini
+c:\temp\zomgout\Expanded\Npdb\#ServiceConfig.ini#
+c:/temp/zomgout/Expanded/Npdb_Prodbase/ServiceConfig.ini
+c:\temp\zomgout\Expanded\Npdb_Prodbase\#ServiceConfig.ini#
+c:/temp/zomgout/Expanded/Catalog/ServiceConfig.ini
+c:\temp\zomgout\Expanded\Catalog\#ServiceConfig.ini#
diff --git a/.emacs.d/auto-save-list/.saves-3964-JOHNDOTY-1~ b/.emacs.d/auto-save-list/.saves-3964-JOHNDOTY-1~
new file mode 100644
index 0000000..ef74f54
--- /dev/null
+++ b/.emacs.d/auto-save-list/.saves-3964-JOHNDOTY-1~
@@ -0,0 +1,24 @@
+c:/src/sls/source/xhttplite/Main/Dev/XHttpLite/HttpStack.cs
+c:\src\sls\source\xhttplite\Main\Dev\XHttpLite\#HttpStack.cs#
+c:/src/sls/source/xhttplite/Main/Dev/XHttpLite/Core/UtilHttpListener.cs
+c:\src\sls\source\xhttplite\Main\Dev\XHttpLite\Core\#UtilHttpListener.cs#
+c:/src/sls/source/xhttplite/Main/Dev/XHttpLite/HttpLiteService.cs
+c:\src\sls\source\xhttplite\Main\Dev\XHttpLite\#HttpLiteService.cs#
+c:/src/xonline/private/setup/octopus/xdl/definition/topologies/expanded.xml
+c:\src\xonline\private\setup\octopus\xdl\definition\topologies\#expanded.xml#
+c:/src/iebsilver/AutopilotService/BLULab/Prime-Pvt-BluLab/xonline.ini
+c:\src\iebsilver\AutopilotService\BLULab\Prime-Pvt-BluLab\#xonline.ini#
+c:/src/xonline/private/server/ContentIngestion/catalog/CatalogDatabase.cs
+c:\src\xonline\private\server\ContentIngestion\catalog\#CatalogDatabase.cs#
+c:/src/xonline/private/server/ContentIngestion/catalog/Locale.cs
+c:\src\xonline\private\server\ContentIngestion\catalog\#Locale.cs#
+c:/src/xonline/private/server/ContentIngestion/catalog/MediaLocaleMap.cs
+c:\src\xonline\private\server\ContentIngestion\catalog\#MediaLocaleMap.cs#
+c:/Users/JohnDoty/Desktop/FFFF0400_2012-06-14_23-19-37_Fail.log
+c:\Users\JohnDoty\Desktop\#FFFF0400_2012-06-14_23-19-37_Fail.log#
+c:/src/iebsilver/AutopilotService/BLULab/Prime-Pvt-BluLab/deployment.ini
+c:\src\iebsilver\AutopilotService\BLULab\Prime-Pvt-BluLab\#deployment.ini#
+c:/src/xonline/private/setup/octopus/xdl/definition/components/misc/AutopilotSpecific.xml
+c:\src\xonline\private\setup\octopus\xdl\definition\components\misc\#AutopilotSpecific.xml#
+c:/src/xonline/private/setup/octopus/xdl/definition/environments/xboxprime.xml
+c:\src\xonline\private\setup\octopus\xdl\definition\environments\#xboxprime.xml#
diff --git a/.emacs.d/auto-save-list/.saves-5732-JOHNDOTY-1~ b/.emacs.d/auto-save-list/.saves-5732-JOHNDOTY-1~
new file mode 100644
index 0000000..33e97a0
--- /dev/null
+++ b/.emacs.d/auto-save-list/.saves-5732-JOHNDOTY-1~
@@ -0,0 +1,26 @@
+c:/src/newcommerce/ServiceTemplateWizard/Main/private/src/TemplateFiles/FrontDoor/IEBServiceFD.csproj
+c:\src\newcommerce\ServiceTemplateWizard\Main\private\src\TemplateFiles\FrontDoor\#IEBServiceFD.csproj#
+c:/src/newcommerce/ServiceTemplateWizard/Main/private/src/TemplateFiles/ServiceTests/IEBServiceTests.vstemplate
+c:\src\newcommerce\ServiceTemplateWizard\Main\private\src\TemplateFiles\ServiceTests\#IEBServiceTests.vstemplate#
+c:/src/newcommerce/ServiceTemplateWizard/Main/private/src/TemplateFiles/ServiceTests/ServiceTests.csproj
+c:\src\newcommerce\ServiceTemplateWizard\Main\private\src\TemplateFiles\ServiceTests\#ServiceTests.csproj#
+c:/users/johndoty/documents/Visual Studio 2010/Projects/IEBService21/IEBService21/test/TheServiceTests/TheServiceTests.csproj
+c:\users\johndoty\documents\Visual Studio 2010\Projects\IEBService21\IEBService21\test\TheServiceTests\#TheServiceTests.csproj#
+c:/src/newcommerce/ServiceTemplateWizard/Main/private/src/TemplateFiles/FrontDoor/IEBServiceFrontDoor.vstemplate
+c:\src\newcommerce\ServiceTemplateWizard\Main\private\src\TemplateFiles\FrontDoor\#IEBServiceFrontDoor.vstemplate#
+c:/users/johndoty/documents/Visual Studio 2010/Projects/IEBService21/IEBService21/src/TheServiceFD/TheServiceFD.csproj
+c:\users\johndoty\documents\Visual Studio 2010\Projects\IEBService21\IEBService21\src\TheServiceFD\#TheServiceFD.csproj#
+c:/src/newcommerce/ServiceTemplateWizard/Main/private/src/IEBServiceTemplateWizard.csproj
+c:\src\newcommerce\ServiceTemplateWizard\Main\private\src\#IEBServiceTemplateWizard.csproj#
+c:/src/newcommerce/ServiceTemplateWizard/Main/private/src/Microsoft/IEB/CommercialServices/Tools/ServiceTemplateWizard/Wizard.cs
+c:\src\newcommerce\ServiceTemplateWizard\Main\private\src\Microsoft\IEB\CommercialServices\Tools\ServiceTemplateWizard\#Wizard.cs#
+c:/src/newcommerce/ServiceTemplateWizard/Main/private/src/Microsoft/IEB/CommercialServices/Tools/ServiceTemplateWizard/UserControls/FinishedUserControl.cs
+c:\src\newcommerce\ServiceTemplateWizard\Main\private\src\Microsoft\IEB\CommercialServices\Tools\ServiceTemplateWizard\UserControls\#FinishedUserControl.cs#
+c:/src/newcommerce/ServiceTemplateWizard/Main/private/src/Microsoft/IEB/CommercialServices/Tools/ServiceTemplateWizard/WizardForm.cs
+c:\src\newcommerce\ServiceTemplateWizard\Main\private\src\Microsoft\IEB\CommercialServices\Tools\ServiceTemplateWizard\#WizardForm.cs#
+c:/src/newcommerce/ServiceTemplateWizard/Main/private/src/Microsoft/IEB/CommercialServices/Tools/ServiceTemplateWizard/WizardPage.cs
+c:\src\newcommerce\ServiceTemplateWizard\Main\private\src\Microsoft\IEB\CommercialServices\Tools\ServiceTemplateWizard\#WizardPage.cs#
+c:/src/newcommerce/ServiceTemplateWizard/Main/private/src/Microsoft/IEB/CommercialServices/Tools/ServiceTemplateWizard/WizardForm.Designer.cs
+c:\src\newcommerce\ServiceTemplateWizard\Main\private\src\Microsoft\IEB\CommercialServices\Tools\ServiceTemplateWizard\#WizardForm.Designer.cs#
+c:/src/iebsilver/AutopilotService/BLULab/Prime-Pvt-BluLab/xonline.ini
+c:\src\iebsilver\AutopilotService\BLULab\Prime-Pvt-BluLab\#xonline.ini#
diff --git a/.emacs.d/auto-save-list/.saves-5968-JOHNDOTY-1~ b/.emacs.d/auto-save-list/.saves-5968-JOHNDOTY-1~
new file mode 100644
index 0000000..4ea1ba1
--- /dev/null
+++ b/.emacs.d/auto-save-list/.saves-5968-JOHNDOTY-1~
@@ -0,0 +1,70 @@
+c:/src/newcommerce/Tools/xdlc/Main/private/src/xdlc/AutopilotSupport.psm1
+c:\src\newcommerce\Tools\xdlc\Main\private\src\xdlc\#AutopilotSupport.psm1#
+c:/src/AutopilotService/autopilotService/Co1PPE/xboxprime-test-co1ppe/deployment.ini
+c:\src\AutopilotService\autopilotService\Co1PPE\xboxprime-test-co1ppe\#deployment.ini#
+c:/src/xonline/private/setup/Autopilot/XOnlineLocalWatchdog/XOnlineLocalWatchdog.ps1
+c:\src\xonline\private\setup\Autopilot\XOnlineLocalWatchdog\#XOnlineLocalWatchdog.ps1#
+c:/src/xonline/private/setup/octopus/xdl/definition/topologies/expanded.xml
+c:\src\xonline\private\setup\octopus\xdl\definition\topologies\#expanded.xml#
+c:/src/xonline/private/setup/octopus/xdl/definition/components/common/WebstoreClient.xml
+c:\src\xonline\private\setup\octopus\xdl\definition\components\common\#WebstoreClient.xml#
+c:/src/AutopilotService/autopilotService/Co1PPE/xboxprime-test-co1ppe/machines.csv
+c:\src\AutopilotService\autopilotService\Co1PPE\xboxprime-test-co1ppe\#machines.csv#
+c:/src/xonline/private/setup/octopus/xdl/definition/installsteps/DbProdbase.xml
+c:\src\xonline\private\setup\octopus\xdl\definition\installsteps\#DbProdbase.xml#
+c:/src/xonline/private/setup/octopus/xdl/definition/components/database/Uodb.xml
+c:\src\xonline\private\setup\octopus\xdl\definition\components\database\#Uodb.xml#
+c:/src/AutopilotService/autopilotService/Co1PPE/xboxprime-test-co1ppe/xonline.ini
+c:\src\AutopilotService\autopilotService\Co1PPE\xboxprime-test-co1ppe\#xonline.ini#
+c:/temp/zomgout/AutoXOnline/Expanded/NpdbBootstrap/start.ps1
+c:\temp\zomgout\AutoXOnline\Expanded\NpdbBootstrap\#start.ps1#
+c:/src/newcommerce/Developer/JohnDoty/Play/XOnlineHealth/XOnlineHealth/XOnlineHealth.ps1
+c:\src\newcommerce\Developer\JohnDoty\Play\XOnlineHealth\XOnlineHealth\#XOnlineHealth.ps1#
+c:/src/xonline/private/common/xmgmtlib/xomcontrol.cpp
+c:\src\xonline\private\common\xmgmtlib\#xomcontrol.cpp#
+c:/src/xonline/private/common/xmgmtlib/xmgmt.cpp
+c:\src\xonline\private\common\xmgmtlib\#xmgmt.cpp#
+c:/src/xonline/private/common/config/config/ConfigInstance.cs
+c:\src\xonline\private\common\config\config\#ConfigInstance.cs#
+c:/src/xonline/private/server/xrlscan/XrlScan.cpp
+c:\src\xonline\private\server\xrlscan\#XrlScan.cpp#
+c:/src/xonline/private/common/xmgmtlib/xomcmmon.cpp
+c:\src\xonline\private\common\xmgmtlib\#xomcmmon.cpp#
+c:/src/xonline/private/common/xmgmtlib/xomadmin.cpp
+c:\src\xonline\private\common\xmgmtlib\#xomadmin.cpp#
+c:/src/xonline/private/server/mgmt/xmgmtsrv/clientservice.cpp
+c:\src\xonline\private\server\mgmt\xmgmtsrv\#clientservice.cpp#
+c:/src/xonline/private/setup/octopus/xdl/definition/components/misc/AutopilotSpecific.xml
+c:\src\xonline\private\setup\octopus\xdl\definition\components\misc\#AutopilotSpecific.xml#
+c:/src/xonline/private/setup/octopus/xdl/definition/releases/AutopilotRelease.xml
+c:\src\xonline\private\setup\octopus\xdl\definition\releases\#AutopilotRelease.xml#
+c:/src/xonline/private/setup/Autopilot/XOnlineLocalWatchdog/placefile
+c:\src\xonline\private\setup\Autopilot\XOnlineLocalWatchdog\#placefile#
+c:/src/xonline/private/setup/Autopilot/XOnlineLocalWatchdog/sources
+c:\src\xonline\private\setup\Autopilot\XOnlineLocalWatchdog\#sources#
+c:/src/xonline/private/setup/Autopilot/XOnlineLocalWatchdog/RegisterEventSources.ps1
+c:\src\xonline\private\setup\Autopilot\XOnlineLocalWatchdog\#RegisterEventSources.ps1#
+c:/src/xonline/private/setup/Autopilot/dirs
+c:\src\xonline\private\setup\Autopilot\#dirs#
+c:/src/commerce/Main/public/src/livecache/client/Data/LcAccountCreation.cs
+c:\src\commerce\Main\public\src\livecache\client\Data\#LcAccountCreation.cs#
+c:/src/xonline/private/setup/octopus/xdl/definition/topologies/Sandbox.xml
+c:\src\xonline\private\setup\octopus\xdl\definition\topologies\#Sandbox.xml#
+c:/src/commerce/Main/private/tools/ZestDeploymentGenerator/Powershell/FrontDoorPrerequisitesModule.psm1
+c:\src\commerce\Main\private\tools\ZestDeploymentGenerator\Powershell\#FrontDoorPrerequisitesModule.psm1#
+c:/src/AutopilotService/autopilotService/Co1PPE/xboxprime-test-co1ppe/Environment.ini
+c:\src\AutopilotService\autopilotService\Co1PPE\xboxprime-test-co1ppe\#Environment.ini#
+c:/src/xonline/private/setup/octopus/xdl/definition/components/common/ConfigureDTC.xml
+c:\src\xonline\private\setup\octopus\xdl\definition\components\common\#ConfigureDTC.xml#
+c:/src/commerce/Main/public/src/xblcore/service/XRLRequest.cs
+c:\src\commerce\Main\public\src\xblcore\service\#XRLRequest.cs#
+c:/src/commerce/Main/public/src/livecache/client/Logic/LcRequest.cs
+c:\src\commerce\Main\public\src\livecache\client\Logic\#LcRequest.cs#
+c:/src/commerce/Main/public/src/livecache/client/LivecacheProtocol.cs
+c:\src\commerce\Main\public\src\livecache\client\#LivecacheProtocol.cs#
+c:/src/commerce/Main/public/src/livecache/client/Data/LcStringSvr.cs
+c:\src\commerce\Main\public\src\livecache\client\Data\#LcStringSvr.cs#
+c:/src/commerce/Main/private/service/zest-commerce/src/dalcommerce/LiveCache/LiveCacheAccountDal.cs
+c:\src\commerce\Main\private\service\zest-commerce\src\dalcommerce\LiveCache\#LiveCacheAccountDal.cs#
+c:/src/xonline/private/setup/Autopilot/OpenHealthchecks/OpenHealthChecks.ps1
+c:\src\xonline\private\setup\Autopilot\OpenHealthchecks\#OpenHealthChecks.ps1#
diff --git a/.emacs.d/auto-save-list/.saves-6384-JOHNDOTY-1~ b/.emacs.d/auto-save-list/.saves-6384-JOHNDOTY-1~
new file mode 100644
index 0000000..f1baa3a
--- /dev/null
+++ b/.emacs.d/auto-save-list/.saves-6384-JOHNDOTY-1~
@@ -0,0 +1,8 @@
+c:/users/johndoty/documents/Visual Studio 2010/Projects/IEBService21/IEBService21/src/TheServiceFD/TheServiceFD.csproj
+c:\users\johndoty\documents\Visual Studio 2010\Projects\IEBService21\IEBService21\src\TheServiceFD\#TheServiceFD.csproj#
+c:/users/johndoty/documents/Visual Studio 2010/Projects/IEBService21/IEBService21/src/TheServiceFD/TheServiceFD.events
+c:\users\johndoty\documents\Visual Studio 2010\Projects\IEBService21\IEBService21\src\TheServiceFD\#TheServiceFD.events#
+c:/src/sls/build/MSBuild/GenerateECOEvents.targets
+c:\src\sls\build\MSBuild\#GenerateECOEvents.targets#
+c:/src/sls/build/MSBuild/build.settings
+c:\src\sls\build\MSBuild\#build.settings#
diff --git a/.emacs.d/auto-save-list/.saves-8628-JOHNDOTY-1~ b/.emacs.d/auto-save-list/.saves-8628-JOHNDOTY-1~
new file mode 100644
index 0000000..a3968cf
--- /dev/null
+++ b/.emacs.d/auto-save-list/.saves-8628-JOHNDOTY-1~
@@ -0,0 +1,8 @@
+c:/temp/zomgout/AutoXOnline/Expanded/NpdbBootstrap/AutopilotSupport.psm1
+c:\temp\zomgout\AutoXOnline\Expanded\NpdbBootstrap\#AutopilotSupport.psm1#
+c:/temp/zomgout/AutoXOnline/Expanded/NpdbBootstrap/ConsumeService.ps1
+c:\temp\zomgout\AutoXOnline\Expanded\NpdbBootstrap\#ConsumeService.ps1#
+c:/temp/zomgout/AutoXOnline/Expanded/NpdbBootstrap/ConsumeService.cmd
+c:\temp\zomgout\AutoXOnline\Expanded\NpdbBootstrap\#ConsumeService.cmd#
+c:/src/AutopilotService/autopilotService/Co1PPE/xboxprime-test-co1ppe/deployment.ini
+c:\src\AutopilotService\autopilotService\Co1PPE\xboxprime-test-co1ppe\#deployment.ini#
diff --git a/.emacs.d/auto-save-list/.saves-9000-JOHNDOTY-1~ b/.emacs.d/auto-save-list/.saves-9000-JOHNDOTY-1~
new file mode 100644
index 0000000..9244b92
--- /dev/null
+++ b/.emacs.d/auto-save-list/.saves-9000-JOHNDOTY-1~
@@ -0,0 +1,150 @@
+c:/src/xonline/private/common/core/installer/XomConfigurator.cs
+c:\src\xonline\private\common\core\installer\#XomConfigurator.cs#
+c:/temp/zomgout/AutoXOnline/sandbox/servicemap.ini
+c:\temp\zomgout\AutoXOnline\sandbox\#servicemap.ini#
+c:/src/xonline/private/setup/octopus/xdl/definition/components/inh/SgOnebox.xml
+c:\src\xonline\private\setup\octopus\xdl\definition\components\inh\#SgOnebox.xml#
+c:/src/xonline/private/setup/octopus/xdl/definition/components/inh/SgServer.xml
+c:\src\xonline\private\setup\octopus\xdl\definition\components\inh\#SgServer.xml#
+c:/src/xonline/private/setup/octopus/xdl/definition/components/inh/Acceleration.xml
+c:\src\xonline\private\setup\octopus\xdl\definition\components\inh\#Acceleration.xml#
+c:/src/xonline/private/setup/octopus/xdl/definition/topologies/expanded.xml
+c:\src\xonline\private\setup\octopus\xdl\definition\topologies\#expanded.xml#
+c:/src/AutopilotService/autopilotService/Co1PPE/xboxprime-test-co1ppe/machines.csv
+c:\src\AutopilotService\autopilotService\Co1PPE\xboxprime-test-co1ppe\#machines.csv#
+c:/temp/zomgout/AutoXOnline/Expanded/servicemap.ini
+c:\temp\zomgout\AutoXOnline\Expanded\#servicemap.ini#
+c:/src/xonline/private/server/stats/progress/progressshimfd.csproj
+c:\src\xonline\private\server\stats\progress\#progressshimfd.csproj#
+c:/src/AutopilotService/autopilotService/Co1PPE/xboxprime-test-co1ppe/deployment.ini
+c:\src\AutopilotService\autopilotService\Co1PPE\xboxprime-test-co1ppe\#deployment.ini#
+c:/src/AutopilotService/autopilotService/Co1PPE/xboxprime-test-co1ppe/xonline.ini
+c:\src\AutopilotService\autopilotService\Co1PPE\xboxprime-test-co1ppe\#xonline.ini#
+c:/src/commerce/VNext/private/tools/ZestDeploymentGenerator/Powershell/FrontDoorPrerequisitesModule.psm1
+c:\src\commerce\VNext\private\tools\ZestDeploymentGenerator\Powershell\#FrontDoorPrerequisitesModule.psm1#
+c:/src/commerce/VNext/private/tools/ZestDeploymentGenerator/Powershell/FrontDoorPostrequisitesModule.psm1
+c:\src\commerce\VNext\private\tools\ZestDeploymentGenerator\Powershell\#FrontDoorPostrequisitesModule.psm1#
+c:/src/xonline/private/setup/octopus/xdl/definition/installsteps/PropCert.xml
+c:\src\xonline\private\setup\octopus\xdl\definition\installsteps\#PropCert.xml#
+c:/src/xonline/private/server/stats/progress/placefile
+c:\src\xonline\private\server\stats\progress\#placefile#
+c:/src/xonline/private/msi/frontdoors/progressshim/progressshimfd.wxs
+c:\src\xonline\private\msi\frontdoors\progressshim\#progressshimfd.wxs#
+c:/src/newcommerce/Tools/xdlc/Main/private/src/xdlc/AutopilotSupport.psm1
+c:\src\newcommerce\Tools\xdlc\Main\private\src\xdlc\#AutopilotSupport.psm1#
+c:/src/AutopilotService/autopilotService/Co1PPE/xbox-Test-co1ppe/machines.csv
+c:\src\AutopilotService\autopilotService\Co1PPE\xbox-Test-co1ppe\#machines.csv#
+c:/temp/zomgout/AutoXOnline/Expanded/ConfigureIIS/ConfigureIISModule.psm1
+c:\temp\zomgout\AutoXOnline\Expanded\ConfigureIIS\#ConfigureIISModule.psm1#
+c:/temp/zomgout/AutoXOnline/Expanded/Npdb_Prodbase/DbProdbaseModule.psm1
+c:\temp\zomgout\AutoXOnline\Expanded\Npdb_Prodbase\#DbProdbaseModule.psm1#
+c:/temp/zomgout/AutoXOnline/Expanded/Npdb_Prodbase/start.ps1
+c:\temp\zomgout\AutoXOnline\Expanded\Npdb_Prodbase\#start.ps1#
+c:/temp/zomgout/AutoXOnline/Expanded/Npdb/DbUpgradeModule.psm1
+c:\temp\zomgout\AutoXOnline\Expanded\Npdb\#DbUpgradeModule.psm1#
+c:/temp/zomgout/AutoXOnline/Expanded/Npdb/NpdbModule.psm1
+c:\temp\zomgout\AutoXOnline\Expanded\Npdb\#NpdbModule.psm1#
+c:/temp/zomgout/AutoXOnline/Expanded/ProfileShim/start.ps1
+c:\temp\zomgout\AutoXOnline\Expanded\ProfileShim\#start.ps1#
+c:/src/xonline/private/setup/octopus/xdl/definition/components/database/npdb.xml
+c:\src\xonline\private\setup\octopus\xdl\definition\components\database\#npdb.xml#
+c:/src/xonline/private/setup/octopus/xdl/definition/components/misc/AutopilotSpecific.xml
+c:\src\xonline\private\setup\octopus\xdl\definition\components\misc\#AutopilotSpecific.xml#
+c:/src/xonline/private/setup/octopus/xdl/definition/topologies/Sandbox.xml
+c:\src\xonline\private\setup\octopus\xdl\definition\topologies\#Sandbox.xml#
+c:/src/xonline/private/setup/octopus/xdl/definition/Properties.xml
+c:\src\xonline\private\setup\octopus\xdl\definition\#Properties.xml#
+c:/src/xonline/private/setup/octopus/xdl/definition/installsteps/DbProdbase.xml
+c:\src\xonline\private\setup\octopus\xdl\definition\installsteps\#DbProdbase.xml#
+c:/src/xonline/private/tools/wstrunner/console/WstRunnerCmd.cs
+c:\src\xonline\private\tools\wstrunner\console\#WstRunnerCmd.cs#
+c:/src/xonline/private/setup/octopus/xdl/definition/releases/AutopilotRelease.xml
+c:\src\xonline\private\setup\octopus\xdl\definition\releases\#AutopilotRelease.xml#
+c:/src/xonline/private/setup/Autopilot/dirs
+c:\src\xonline\private\setup\Autopilot\#dirs#
+c:/src/xonline/private/tools/wstrunner/core/WstRunnerConfig.cs
+c:\src\xonline\private\tools\wstrunner\core\#WstRunnerConfig.cs#
+c:/src/xonline/private/tools/wstrunner/console/WstRunnerInstall.cs
+c:\src\xonline\private\tools\wstrunner\console\#WstRunnerInstall.cs#
+c:/src/xonline/private/tools/wstrunner/installer/WstRunnerInstaller.cs
+c:\src\xonline\private\tools\wstrunner\installer\#WstRunnerInstaller.cs#
+c:/temp/zomgout/AutoXOnline/Expanded/ProfileShim/ProfileShimModule.psm1
+c:\temp\zomgout\AutoXOnline\Expanded\ProfileShim\#ProfileShimModule.psm1#
+c:/temp/zomgout/AutoXOnline/Expanded/Xbos/InstallPropCertModule.psm1
+c:\temp\zomgout\AutoXOnline\Expanded\Xbos\#InstallPropCertModule.psm1#
+c:/temp/zomgout/AutoXOnline/Expanded/Xbos/PropCertModule.psm1
+c:\temp\zomgout\AutoXOnline\Expanded\Xbos\#PropCertModule.psm1#
+c:/temp/zomgout/AutoXOnline/Expanded/Xbos/XbosModule.psm1
+c:\temp\zomgout\AutoXOnline\Expanded\Xbos\#XbosModule.psm1#
+c:/temp/zomgout/AutoXOnline/Expanded/Stats/StatsModule.psm1
+c:\temp\zomgout\AutoXOnline\Expanded\Stats\#StatsModule.psm1#
+c:/temp/zomgout/AutoXOnline/Expanded/Stats/SetupFrontDoorModule.psm1
+c:\temp\zomgout\AutoXOnline\Expanded\Stats\#SetupFrontDoorModule.psm1#
+c:/src/newcommerce/Tools/xdlc/Main/private/src/xdlc/xdlc.csproj
+c:\src\newcommerce\Tools\xdlc\Main\private\src\xdlc\#xdlc.csproj#
+c:/temp/zomgout/AutoXOnline/Expanded/Stats/ConsumeService.ps1
+c:\temp\zomgout\AutoXOnline\Expanded\Stats\#ConsumeService.ps1#
+c:/temp/zomgout/AutoXOnline/Expanded/Stats/ConsumeService.cmd
+c:\temp\zomgout\AutoXOnline\Expanded\Stats\#ConsumeService.cmd#
+c:/temp/zomgout/AutoXOnline/Expanded/Stats/ServiceConfig.ini
+c:\temp\zomgout\AutoXOnline\Expanded\Stats\#ServiceConfig.ini#
+c:/temp/zomgout/AutoXOnline/Expanded/ProfileShim/ServiceConfig.ini
+c:\temp\zomgout\AutoXOnline\Expanded\ProfileShim\#ServiceConfig.ini#
+c:/src/xonline/private/msi/frontdoors/profileshim/profileshimfd.wxs
+c:\src\xonline\private\msi\frontdoors\profileshim\#profileshimfd.wxs#
+c:/src/xonline/private/server/stats/profile/xrlSyncSettings.cs
+c:\src\xonline\private\server\stats\profile\#xrlSyncSettings.cs#
+c:/temp/buildap.bat
+c:\temp\#buildap.bat#
+c:/src/octopus/private/source/Octopus/Octopus/Code/Agent/OctopusAgent/msis.cpp
+c:\src\octopus\private\source\Octopus\Octopus\Code\Agent\OctopusAgent\#msis.cpp#
+c:/src/octopus/private/source/Octopus/Octopus/Code/Drivers/OctopusAgentDriver.cs
+c:\src\octopus\private\source\Octopus\Octopus\Code\Drivers\#OctopusAgentDriver.cs#
+c:/src/octopus/private/source/Octopus/Octopus/Code/Engine/Execution/ServerExecutor.cs
+c:\src\octopus\private\source\Octopus\Octopus\Code\Engine\Execution\#ServerExecutor.cs#
+c:/src/xonline/private/server/stats/profile/placefile
+c:\src\xonline\private\server\stats\profile\#placefile#
+c:/src/octopus/private/source/Octopus/Octopus/Code/Common/WindowsInstaller/MsiFileHelper.cs
+c:\src\octopus\private\source\Octopus\Octopus\Code\Common\WindowsInstaller\#MsiFileHelper.cs#
+c:/src/octopus/private/source/Octopus/Octopus/Code/Common/StringVersionComparer.cs
+c:\src\octopus\private\source\Octopus\Octopus\Code\Common\#StringVersionComparer.cs#
+c:/src/octopus/private/source/Octopus/Octopus/Code/Agent/OctopusAgent/GetAllProducts.cpp
+c:\src\octopus\private\source\Octopus\Octopus\Code\Agent\OctopusAgent\#GetAllProducts.cpp#
+c:/src/octopus/private/source/Octopus/Octopus/Code/Agent/OctopusAgent/AgentInterface.h
+c:\src\octopus\private\source\Octopus\Octopus\Code\Agent\OctopusAgent\#AgentInterface.h#
+c:/src/octopus/private/source/Octopus/Octopus/Code/Agent/OctopusAgent/AgentInterface.cpp
+c:\src\octopus\private\source\Octopus\Octopus\Code\Agent\OctopusAgent\#AgentInterface.cpp#
+c:/src/octopus/private/source/Octopus/Octopus/Code/Drivers/OctopusAgent.cs
+c:\src\octopus\private\source\Octopus\Octopus\Code\Drivers\#OctopusAgent.cs#
+c:/src/octopus/private/source/Octopus/Octopus/Code/Agent/OctopusAgent/OctopusAgent.cpp
+c:\src\octopus\private\source\Octopus\Octopus\Code\Agent\OctopusAgent\#OctopusAgent.cpp#
+c:/src/xonline/public/ext/tools/x86/ADT/ADTTools.ps1
+c:\src\xonline\public\ext\tools\x86\ADT\#ADTTools.ps1#
+c:/src/xonline/public/ext/tools/x86/ADTScript.ps1
+c:\src\xonline\public\ext\tools\x86\#ADTScript.ps1#
+c:/src/xonline/private/msi/frontdoors/activeauth/authsg.wxs
+c:\src\xonline\private\msi\frontdoors\activeauth\#authsg.wxs#
+c:/src/xonline/private/msi/common/CommonDeployment/CommonDeployment.wxs
+c:\src\xonline\private\msi\common\CommonDeployment\#CommonDeployment.wxs#
+c:/src/xonline/private/msi/frontdoors/xmachine/xmachine.wxs
+c:\src\xonline\private\msi\frontdoors\xmachine\#xmachine.wxs#
+c:/src/xonline/private/msi/common/CommonDeployment/CommonHeader.wxi
+c:\src\xonline\private\msi\common\CommonDeployment\#CommonHeader.wxi#
+c:/src/sls/source/Platform/Ship/1.0/Configuration/xml/XmlFileConfig.cs
+c:\src\sls\source\Platform\Ship\1.0\Configuration\xml\#XmlFileConfig.cs#
+c:/src/AutopilotService/autopilotService/Co1PPE/xboxprime-test-co1ppe/Environment.ini
+c:\src\AutopilotService\autopilotService\Co1PPE\xboxprime-test-co1ppe\#Environment.ini#
+c:/src/sls/source/Platform/Ship/1.1/Configuration/xml/XmlFileConfig.cs
+c:\src\sls\source\Platform\Ship\1.1\Configuration\xml\#XmlFileConfig.cs#
+c:/src/xonline/private/server/stats/profile/web.config
+c:\src\xonline\private\server\stats\profile\#web.config#
+c:/src/sls/source/Platform/Ship/1.1/Configuration/xml/Schema/XmlHttpService.cs
+c:\src\sls\source\Platform\Ship\1.1\Configuration\xml\Schema\#XmlHttpService.cs#
+c:/src/xonline/private/server/stats/profile/profilefeapp.cs
+c:\src\xonline\private\server\stats\profile\#profilefeapp.cs#
+c:/src/xonline/private/server/stats/profile/profileshimfd.csproj
+c:\src\xonline\private\server\stats\profile\#profileshimfd.csproj#
+c:/src/xonline/private/setup/Autopilot/NpdbBootstrap/SetupNpdb.ps1
+c:\src\xonline\private\setup\Autopilot\NpdbBootstrap\#SetupNpdb.ps1#
+c:/src/xonline/private/setup/Autopilot/NpdbBootstrap/NpdbUtils.psm1
+c:\src\xonline\private\setup\Autopilot\NpdbBootstrap\#NpdbUtils.psm1#
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index ce3942a..5d42a4e 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -21,6 +21,7 @@
  '(c-label-offset -4)
  '(fast-lock-cache-directories (quote ("~/flc-cache")))
  '(fast-lock-minimum-size nil)
+ '(fill-column 120)
  '(find-file-run-dired t)
  '(font-lock-global-modes t)
  '(font-lock-maximum-size nil)
@@ -174,6 +175,7 @@
 ;; Text mode configuration.
 ;; =================================================================
 (defun my-text-mode-hook ()
+  (setq fill-column 70)
   (turn-on-auto-fill)
   (flyspell-mode))
 
@@ -494,3 +496,14 @@
 (autoload 'lua-mode "lua-mode" "Lua editing mode." t)
 (add-to-list 'auto-mode-alist '("\\.lua$" . lua-mode))
 (add-to-list 'interpreter-mode-alist '("lua" . lua-mode))
+
+;; Column markers
+(require 'column-marker)
+
+(custom-set-faces
+  ;; custom-set-faces was added by Custom.
+  ;; If you edit it by hand, you could mess it up, so be careful.
+  ;; Your init file should contain only one such instance.
+  ;; If there is more than one, they won't work right.
+ )
+
diff --git a/site-lisp/column-marker.el b/site-lisp/column-marker.el
new file mode 100644
index 0000000..00639e8
--- /dev/null
+++ b/site-lisp/column-marker.el
@@ -0,0 +1,259 @@
+;;; column-marker.el --- Highlight certain character columns
+;; 
+;; Filename: column-marker.el
+;; Description: Highlight certain character columns
+;; Author: Rick Bielawski <rbielaws@i1.net>
+;; Maintainer: Rick Bielawski <rbielaws@i1.net>
+;; Created: Tue Nov 22 10:26:03 2005
+;; Version: 
+;; Last-Updated: Fri Jan 22 11:28:48 2010 (-0800)
+;;           By: dradams
+;;     Update #: 312
+;; Keywords: tools convenience highlight
+;; Compatibility: GNU Emacs 21, GNU Emacs 22, GNU Emacs 23
+;; 
+;; Features that might be required by this library:
+;;
+;;   None
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; 
+;;; Commentary: 
+;; 
+;; Highlights the background at a given character column.
+;; 
+;; Commands `column-marker-1', `column-marker-2', and
+;; `column-marker-3' each highlight a given column (using different
+;; background colors, by default).
+;;
+;; - With no prefix argument, each highlights the current column
+;;   (where the cursor is).
+;;
+;; - With a non-negative numeric prefix argument, each highlights that
+;;   column.
+;;
+;; - With plain `C-u' (no number), each turns off its highlighting.
+;;
+;; - With `C-u C-u', each turns off all column highlighting.
+;;
+;; If two commands highlight the same column, the last-issued
+;; highlighting command shadows the other - only the last-issued
+;; highlighting is seen.  If that "topmost" highlighting is then
+;; turned off, the other highlighting for that column then shows
+;; through.
+;;
+;; Examples:
+;;
+;; M-x column-marker-1 highlights the column where the cursor is, in
+;; face `column-marker-1'.
+;;
+;; C-u 70 M-x column-marker-2 highlights column 70 in face
+;; `column-marker-2'.
+;;
+;; C-u 70 M-x column-marker-3 highlights column 70 in face
+;; `column-marker-3'.  The face `column-marker-2' highlighting no
+;; longer shows.
+;;
+;; C-u M-x column-marker-3 turns off highlighting for column-marker-3,
+;; so face `column-marker-2' highlighting shows again for column 70.
+;;
+;; C-u C-u M-x column-marker-1 (or -2 or -3) erases all column
+;; highlighting.
+;;
+;; These commands use `font-lock-fontify-buffer', so syntax
+;; highlighting (`font-lock-mode') must be turned on.  There might be
+;; a performance impact during refontification.
+;;
+;;
+;; Installation: Place this file on your load path, and put this in
+;; your init file (`.emacs'):
+;;
+;; (require 'column-marker)
+;;
+;; Other init file suggestions (examples):
+;;
+;; ;; Highlight column 80 in foo mode.
+;; (add-hook 'foo-mode-hook (lambda () (interactive) (column-marker-1 80)))
+;;
+;; ;; Use `C-c m' interactively to highlight with face `column-marker-1'.
+;; (global-set-key [?\C-c ?m] 'column-marker-1)
+;;
+;;
+;; Please report any bugs!
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; 
+;;; Change log:
+;;
+;; 2009/12/10 dadams
+;;     column-marker-internal: Quote the face.  Thx to Johan Bockgård.
+;; 2009/12/09 dadams
+;;     column-marker-find: fset a symbol to the function, and return the symbol.
+;; 2008/01/21 dadams
+;;     Renamed faces by dropping suffix "-face".
+;; 2006/08/18 dadams
+;;     column-marker-create: Add newlines to doc-string sentences.
+;; 2005/12/31 dadams
+;;     column-marker-create: Add marker to column-marker-vars inside the defun,
+;;       so it is done in the right buffer, updating column-marker-vars buffer-locally.
+;;     column-marker-find: Corrected comment.  Changed or to progn for clarity.
+;; 2005/12/29 dadams
+;;     Updated wrt new version of column-marker.el (multi-column characters).
+;;     Corrected stray occurrences of column-marker-here to column-marker-1.
+;;     column-marker-vars: Added make-local-variable.
+;;     column-marker-create: Changed positive to non-negative.
+;;     column-marker-internal: Turn off marker when col is negative, not < 1.
+;; 2005-12-29 RGB
+;;     column-marker.el now supports multi-column characters.
+;; 2005/11/21 dadams
+;;     Combined static and dynamic. 
+;;     Use separate faces for each marker.  Different interactive spec.
+;; 2005/10/19 RGB
+;;     Initial release of column-marker.el.
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+;; Floor, Boston, MA 02110-1301, USA.
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; 
+;;; Code:
+
+;;;;;;;;;;;;;;;;;;;;;;
+
+
+(defface column-marker-1 '((t (:background "gray")))
+  "Face used for a column marker.  Usually a background color."
+  :group 'faces)
+
+(defvar column-marker-1-face 'column-marker-1
+    "Face used for a column marker.  Usually a background color.
+Changing this directly affects only new markers.")
+
+(defface column-marker-2 '((t (:background "cyan3")))
+  "Face used for a column marker.  Usually a background color."
+  :group 'faces)
+
+(defvar column-marker-2-face 'column-marker-2
+    "Face used for a column marker.  Usually a background color.
+Changing this directly affects only new markers." )
+
+(defface column-marker-3 '((t (:background "orchid3")))
+  "Face used for a column marker.  Usually a background color."
+  :group 'faces)
+
+(defvar column-marker-3-face 'column-marker-3
+    "Face used for a column marker.  Usually a background color.
+Changing this directly affects only new markers." )
+
+(defvar column-marker-vars ()
+  "List of all internal column-marker variables")
+(make-variable-buffer-local 'column-marker-vars) ; Buffer local in all buffers.
+
+(defmacro column-marker-create (var &optional face)
+  "Define a column marker named VAR.
+FACE is the face to use.  If nil, then face `column-marker-1' is used."
+  (setq face (or face 'column-marker-1))
+  `(progn
+     ;; define context variable ,VAR so marker can be removed if desired
+     (defvar ,var ()
+       "Buffer local. Used internally to store column marker spec.")
+     ;; context must be buffer local since font-lock is 
+     (make-variable-buffer-local ',var)
+     ;; Define wrapper function named ,VAR to call `column-marker-internal'
+     (defun ,var (arg)
+       ,(concat "Highlight column with face `" (symbol-name face)
+                "'.\nWith no prefix argument, highlight current column.\n"
+                "With non-negative numeric prefix arg, highlight that column number.\n"
+                "With plain `C-u' (no number), turn off this column marker.\n"
+                "With `C-u C-u' or negative prefix arg, turn off all column-marker highlighting.")
+       (interactive "P")
+       (unless (memq ',var column-marker-vars) (push ',var column-marker-vars))
+       (cond ((null arg)          ; Default: highlight current column.
+              (column-marker-internal ',var (1+ (current-column)) ,face))
+             ((consp arg)
+              (if (= 4 (car arg))
+                  (column-marker-internal ',var nil) ; `C-u': Remove this column highlighting.
+                (dolist (var column-marker-vars)
+                  (column-marker-internal var nil)))) ; `C-u C-u': Remove all column highlighting.
+             ((and (integerp arg) (>= arg 0)) ; `C-u 70': Highlight that column.
+              (column-marker-internal ',var (1+ (prefix-numeric-value arg)) ,face))
+             (t           ; `C-u -40': Remove all column highlighting.
+              (dolist (var column-marker-vars)
+                (column-marker-internal var nil)))))))
+
+(defun column-marker-find (col)
+  "Defines a function to locate a character in column COL.
+Returns the function symbol, named `column-marker-move-to-COL'."
+  (let ((fn-symb  (intern (format "column-marker-move-to-%d" col))))
+    (fset `,fn-symb
+          `(lambda (end)
+             (let ((start (point)))
+               (when (> end (point-max)) (setq end (point-max)))
+
+               ;; Try to keep `move-to-column' from going backward, though it still can.
+               (unless (< (current-column) ,col) (forward-line 1))
+
+               ;; Again, don't go backward.  Try to move to correct column.
+               (when (< (current-column) ,col) (move-to-column ,col))
+
+               ;; If not at target column, try to move to it.
+               (while (and (< (current-column) ,col) (< (point) end)
+                           (= 0 (+ (forward-line 1) (current-column)))) ; Should be bol.
+                 (move-to-column ,col))
+
+               ;; If at target column, not past end, and not prior to start,
+               ;; then set match data and return t.  Otherwise go to start
+               ;; and return nil.
+               (if (and (= ,col (current-column)) (<= (point) end) (> (point) start))
+                   (progn (set-match-data (list (1- (point)) (point)))
+                          t)            ; Return t.
+                 (goto-char start)
+                 nil))))                ; Return nil.
+    fn-symb))
+
+(defun column-marker-internal (sym col &optional face)
+  "SYM is the symbol for holding the column marker context.
+COL is the column in which a marker should be set.
+Supplying nil or 0 for COL turns off the marker.
+FACE is the face to use.  If nil, then face `column-marker-1' is used."
+  (setq face (or face 'column-marker-1))
+  (when (symbol-value sym)   ; Remove any previously set column marker
+    (font-lock-remove-keywords nil (symbol-value sym))
+    (set sym nil))
+  (when (or (listp col) (< col 0)) (setq col nil)) ; Allow nonsense stuff to turn off the marker
+  (when col                             ; Generate a new column marker
+    (set sym `((,(column-marker-find col) (0 ',face prepend t))))
+    (font-lock-add-keywords nil (symbol-value sym) t))
+  (font-lock-fontify-buffer))
+
+;; If you need more markers you can create your own similarly.
+;; All markers can be in use at once, and each is buffer-local,
+;; so there is no good reason to define more unless you need more
+;; markers in a single buffer.
+(column-marker-create column-marker-1 column-marker-1-face)
+(column-marker-create column-marker-2 column-marker-2-face)
+(column-marker-create column-marker-3 column-marker-3-face)
+
+;;;###autoload
+(autoload 'column-marker-1 "column-marker" "Highlight a column." t)
+
+;;;;;;;;;;;;;;;;;;
+
+(provide 'column-marker)
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; column-marker.el ends here
\ No newline at end of file
diff --git a/site-lisp/column-marker.elc b/site-lisp/column-marker.elc
new file mode 100644
index 0000000..b681063
Binary files /dev/null and b/site-lisp/column-marker.elc differ
diff --git a/site-lisp/sd.el b/site-lisp/sd.el
index 512b560..63e9ba5 100644
--- a/site-lisp/sd.el
+++ b/site-lisp/sd.el
@@ -109,7 +109,7 @@
 (defvar sd-web-page "http://www.dsmit.com/p4" "The home of p4.el, the basis of SD.EL.")
 
 (eval-and-compile
-  (if (< (string-to-int emacs-version) 20)
+  (if (< (string-to-number emacs-version) 20)
       (progn
     (defmacro defgroup (sym memb doc &rest args)
       t)
@@ -1171,11 +1171,11 @@ type \\[sd-print-with-rev-history]"
     (if (string-match "\\(.*\\)@\\([0-9]+\\)" file-spec)
 	(progn
 	  (setq file-name (match-string 1 file-spec))
-	  (setq change (string-to-int (match-string 2 file-spec)))))
+	  (setq change (string-to-number (match-string 2 file-spec)))))
     (if (string-match "\\(.*\\)#\\([0-9]+\\)" file-spec)
 	(progn
 	  (setq file-name (match-string 1 file-spec))
-	  (setq head-rev (string-to-int (match-string 2 file-spec)))))
+	  (setq head-rev (string-to-number (match-string 2 file-spec)))))
     (sd-exec-sd buffer (list "files" file-name) t)
     (save-excursion
       (set-buffer buffer)
@@ -1189,8 +1189,8 @@ type \\[sd-print-with-rev-history]"
       (while (< (point) (point-max))
 	(if (looking-at (concat "^\\.\\.\\. #\\([0-9]+\\) change \\([0-9]+\\)"
 				"\\s-+\\(\\w+\\) .* by \\(.*\\)@"))
-	    (let ((rev (string-to-int (match-string 1)))
-		  (ch (string-to-int (match-string 2)))
+	    (let ((rev (string-to-number (match-string 1)))
+		  (ch (string-to-number (match-string 2)))
 		  (op (match-string 3)))
 	      (cond ((and change (< change  ch))
 		     nil)
@@ -1238,11 +1238,11 @@ type \\[sd-print-with-rev-history]"
 		    (concat "^\\([0-9]+\\),?\\([0-9]*\\)\\([acd]\\)"
 			    "\\([0-9]+\\),?\\([0-9]*\\)")
 		    nil t)
-	      (let ((la (string-to-int (match-string 1)))
-		    (lb (string-to-int (match-string 2)))
+	      (let ((la (string-to-number (match-string 1)))
+		    (lb (string-to-number (match-string 2)))
 		    (op (match-string 3))
-		    (ra (string-to-int (match-string 4)))
-		    (rb (string-to-int (match-string 5))))
+		    (ra (string-to-number (match-string 4)))
+		    (rb (string-to-number (match-string 5))))
 		(if (= lb 0)
 		    (setq lb la))
 		(if (= rb 0)
@@ -1273,7 +1273,7 @@ type \\[sd-print-with-rev-history]"
 	  (move-to-column 0)
 	  (insert "  Change  Rev\n")
 	  (while (setq line (sd-read-depot-output ch-buffer))
-	    (setq rev (string-to-int line))
+	    (setq rev (string-to-number line))
 	    (setq ch (cdr (assq rev ch-alist)))
 	    (if (= rev old-rev)
 		(insert (format "%13s : " ""))
@@ -1634,11 +1634,11 @@ character events"
 	     (sd-noinput-buffer-action "print" nil t (list fn1))
 	     (sd-activate-print-buffer "*SD print*")))
 	  (action
-	   (let ((rev2 (int-to-string (1- (string-to-int rev))))
+	   (let ((rev2 (int-to-string (1- (string-to-number rev))))
 		 (fn1 (concat filename "#" rev))
 		 (fn2 nil))
 	     (setq fn2 (concat filename "#" rev2))
-	     (if (> (string-to-int rev2) 0)
+	     (if (> (string-to-number rev2) 0)
 		 (progn
 		   (sd-noinput-buffer-action
 		    "diff2" nil t
@@ -1841,7 +1841,7 @@ character events"
     (while (re-search-forward
         (concat "^[@0-9].*\\([cad+]\\)\\([0-9]*\\).*\n"
             "\\(\\(\n\\|[^@0-9\n].*\n\\)*\\)") nil t)
-      (let ((first-line (string-to-int (match-string 2)))
+      (let ((first-line (string-to-number (match-string 2)))
         (start (match-beginning 3))
         (end (match-end 3)))
     (sd-set-extent-property start end 'first-line first-line)
@@ -3026,6 +3026,39 @@ user."
   (interactive "sEnter your e-mail address: ")
   (setq sd-user-email sd-email-address))
 
+;(defun sd-detect-sd ()
+;  "Try to recursively go upwards from this directory and see if a file with
+;the name of the value of SDCONFIG is present. If so, then this is a SD
+;controlled file. Only check if `sd-use-sdconfig-exclusively' is non-nil."
+; (if (not sd-use-sdconfig-exclusively)
+;     ;; no, always call
+;     (sd-check-mode)
+;     ;; yes, use it exclusively
+;     (and (getenv "SDCONFIG")
+;	 (let ((sdconfig (getenv "SDCONFIG"))
+;	       (sd-cfg-dir (cond (buffer-file-name ;; extrapolate from name
+;				  (file-name-directory
+;				   (file-truename (buffer-file-name))))
+;				 (t default-directory) ;; hmm, use default
+;				 ))
+;	       (win32 (if (memq system-type '(ms-dos windows-nt)) t nil)))
+;	   (while (not (or (string-equal sd-cfg-dir (char-to-string directory-sep-char))
+;			   (if win32 (string-match (concat ".:\\" (char-to-string directory-sep-char) "$") sd-cfg-dir) nil)
+;			   (file-exists-p (concat sd-cfg-dir sdconfig))))
+;	     (progn
+;;	       (message sd-cfg-dir)
+;;	       (message (concat "[^\\" (char-to-string directory-sep-char) "]*\\" (char-to-string directory-sep-char) "?$"))
+;	     (setq sd-cfg-dir
+;		   (substring sd-cfg-dir 0
+;			      (string-match (concat "[^\\" (char-to-string directory-sep-char) "]*\\" (char-to-string directory-sep-char) "?$") sd-cfg-dir)))
+;	     ))
+;	   ;; if we did find a sdconfig file, this is under SD control
+;	   (if (not (or (string-equal sd-cfg-dir (char-to-string directory-sep-char))
+;			(if win32 (string-match (concat ".:\\" (char-to-string directory-sep-char) "$") sd-cfg-dir) nil)))
+;	       (sd-check-mode)
+;	     nil)))))
+
+
 (defun sd-detect-sd ()
   "Try to recursively go upwards from this directory and see if a file with
 the name of the value of SDCONFIG is present. If so, then this is a SD
@@ -3042,19 +3075,19 @@ controlled file. Only check if `sd-use-sdconfig-exclusively' is non-nil."
 				 (t default-directory) ;; hmm, use default
 				 ))
 	       (win32 (if (memq system-type '(ms-dos windows-nt)) t nil)))
-	   (while (not (or (string-equal sd-cfg-dir (char-to-string directory-sep-char))
-			   (if win32 (string-match (concat ".:\\" (char-to-string directory-sep-char) "$") sd-cfg-dir) nil)
+	   (while (not (or (string-equal sd-cfg-dir "/")
+			   (if win32 (string-match (concat ".:\\" "/" "$") sd-cfg-dir) nil)
 			   (file-exists-p (concat sd-cfg-dir sdconfig))))
 	     (progn
 ;	       (message sd-cfg-dir)
-;	       (message (concat "[^\\" (char-to-string directory-sep-char) "]*\\" (char-to-string directory-sep-char) "?$"))
+;	       (message (concat "[^\\" "/" "]*\\" "/" "?$"))
 	     (setq sd-cfg-dir
 		   (substring sd-cfg-dir 0
-			      (string-match (concat "[^\\" (char-to-string directory-sep-char) "]*\\" (char-to-string directory-sep-char) "?$") sd-cfg-dir)))
+			      (string-match (concat "[^\\" "/" "]*\\" "/" "?$") sd-cfg-dir)))
 	     ))
 	   ;; if we did find a sdconfig file, this is under SD control
-	   (if (not (or (string-equal sd-cfg-dir (char-to-string directory-sep-char))
-			(if win32 (string-match (concat ".:\\" (char-to-string directory-sep-char) "$") sd-cfg-dir) nil)))
+	   (if (not (or (string-equal sd-cfg-dir "/")
+			(if win32 (string-match (concat ".:\\" "/" "$") sd-cfg-dir) nil)))
 	       (sd-check-mode)
 	     nil)))))
 
diff --git a/site-lisp/sd.elc b/site-lisp/sd.elc
index fbac5ea..e171467 100644
Binary files a/site-lisp/sd.elc and b/site-lisp/sd.elc differ