Merge remote-tracking branch 'origin/nathan' into jesse. Then fixed a
crapload of conflicts and errors
Normalized/fixed variable names
Merge remote-tracking branch 'origin/nathan' into rene
Added implementations for AgentContext, ColorObject, DbDirectory,
DxlExporter and DxlImporter
Merge remote-tracking branch 'origin/rene' into nathan

Signed-off-by: Nathan T Freeman <nathan.freeman@redpilldevelopment.com>