diff --git a/.smalltalk.ston b/.smalltalk.ston
index f0814a8ea..9e5a9fd11 100644
--- a/.smalltalk.ston
+++ b/.smalltalk.ston
@@ -7,14 +7,5 @@ SmalltalkCISpec {
       #load : [ 'Tests' ],
       #directory : 'repository'
     }
-  ],
-  #testing : {
-    #categories : [ 'Metacello-TestsCommonMC', 'Metacello-TestsCore', 
-      'Metacello-TestsCore-Configs', 'Metacello-TestsCore-Specs', 
-      'Metacello-TestsMC', 'Metacello-TestsMCA', 'Metacello-TestsMCB', 
-      'Metacello-TestsMCCore', 'Metacello-TestsMCResources', 
-      'Metacello-TestsPlatform', 'Metacello-TestsReference', 
-      'Metacello-TestsTutorial'
-    ]
-  }
+  ]
 }
diff --git a/.smalltalkA.ston b/.smalltalkA.ston
new file mode 100644
index 000000000..693530269
--- /dev/null
+++ b/.smalltalkA.ston
@@ -0,0 +1,11 @@
+SmalltalkCISpec {
+  #specName : 'Metacello',
+  #loading : [
+    SCIMetacelloLoadSpec {
+      #baseline : 'Metacello',
+      #onWarningLog : true,
+      #load : [ 'TravisCI_1', 'TravisCI_2' ],
+      #directory : 'repository'
+    }
+  ]
+}
diff --git a/.smalltalkB.ston b/.smalltalkB.ston
new file mode 100644
index 000000000..698fb7510
--- /dev/null
+++ b/.smalltalkB.ston
@@ -0,0 +1,11 @@
+SmalltalkCISpec {
+  #specName : 'Metacello',
+  #loading : [
+    SCIMetacelloLoadSpec {
+      #baseline : 'Metacello',
+      #onWarningLog : true,
+      #load : [ 'TravisCI_3' ],
+      #directory : 'repository'
+    }
+  ]
+}
diff --git a/.travis.yml b/.travis.yml
index ba682618d..5ee0fe851 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,110 +1,22 @@
-language: erlang
+language: smalltalk
+sudo: false
 
-sudo: required
+os:
+  - linux
 
-notifications:
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/47796c01bb932d6a0300 # dalehenrich/chat
-      - https://webhooks.gitter.im/e/d6dd211bd92050b46647 # metacello-work chat
-    on_success: always  # options: [always|never|change] default: always
-    on_failure: always  # options: [always|never|change] default: always
-    on_start: false     # default: false
+smalltalk_edge:
+  source: hpi-swa/smalltalkCI
+  branch: dkh-1
 
-env:
-# Tested platforms and versions:
-#
-# GemStone
-#  GemStone-2.4.x
-#  GemStone-3.1.x
-#  GemStone-3.2.x
-#
-# Pharo
-#  Pharo-1.4
-#  Pharo-2.0
-#  Pharo-3.0 
-#  Pharo-4.0 
-#  Pharo-5.0 
-#
-# Squeak
-#  Squeak-4.3 (not all tests are passing)
-#  Squeak-4.4
-#  Squeak-4.5
-#  Squeak-Trunk
+smalltalk_config:
+  - .smalltalkA.ston
+  - .smalltalkB.ston
 
-   - ST=Pharo-4.0 LoadList="'default'" TRAVIS_SCRIPT=userGuide.st     # use Pharo4.0 here until https://github.com/dalehenrich/metacello-work/issues/360 is fixed
-   - ST=GemStone-3.3.0 LoadList="'default'" TRAVIS_SCRIPT=userGuide.st
-
-#   - ST=Pharo-5.0 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
-#   - ST=Pharo-5.0 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
-   - ST=GemStone-3.3.0 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
-   - ST=GemStone-3.3.0 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
-   - ST=Squeak-4.5 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st 
-   - ST=Squeak-4.5 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st 
-
-#   - ST=PharoCore-1.1 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
-#   - ST=PharoCore-1.1 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
-#   - ST=PharoCore-1.2 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
-#   - ST=PharoCore-1.2 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
-#   - ST=PharoCore-1.3 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
-#   - ST=PharoCore-1.3 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
-   - ST=Pharo-1.4 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
-   - ST=Pharo-1.4 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
-   - ST=Pharo-2.0 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
-   - ST=Pharo-2.0 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
-   - ST=Pharo-3.0 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st 
-   - ST=Pharo-3.0 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st 
-   - ST=Pharo-4.0 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
-   - ST=Pharo-4.0 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
-#   - ST=Squeak-4.3 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
-#   - ST=Squeak-4.3 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
-   - ST=Squeak-4.4 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
-   - ST=Squeak-4.4 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
-   - ST=Squeak-4.6 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
-   - ST=Squeak-4.6 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
-   - ST=Squeak-5.0 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
-   - ST=Squeak-5.0 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
-
-   - ST=Squeak-Trunk LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
-   - ST=Squeak-Trunk LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
-
-   - ST=GemStone-2.4.4.1 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
-   - ST=GemStone-2.4.4.1 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
-#   - ST=GemStone-2.4.4.8 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
-#   - ST=GemStone-2.4.4.8 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
-#   - ST=GemStone-2.4.5 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
-#   - ST=GemStone-2.4.5 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
-   - ST=GemStone-2.4.5.3 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
-   - ST=GemStone-2.4.5.3 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
-#   - ST=GemStone-2.4.6 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st # https://github.com/dalehenrich/metacello-work/issues/312
-#   - ST=GemStone-2.4.6 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st # https://github.com/dalehenrich/metacello-work/issues/312
-#   - ST=GemStone-3.0.1 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
-#   - ST=GemStone-3.0.1 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
-   - ST=GemStone-3.1.0.6 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
-   - ST=GemStone-3.1.0.6 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
-   - ST=GemStone-3.2.14 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
-   - ST=GemStone-3.2.14 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
-
-matrix:
-   allow_failures:
-   - env: ST=Squeak-4.4 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
-   - env: ST=Squeak-4.4 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
-   - env: ST=Squeak-4.5 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
-   - env: ST=Squeak-Trunk LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
-   - env: ST=Squeak-Trunk LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
-   - env: ST=Squeak-4.6 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
-   - env: ST=Squeak-5.0 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
-
-
-install:
-   - export PROJECT_HOME="$(pwd)"
-   - cd $HOME
-   - wget -q -O builderCI.zip https://github.com/dalehenrich/builderCI/zipball/master
-   - unzip -q builderCI.zip
-   - cd dalehenrich-builderCI*
-   - source build_env_vars
-   - ln -s $PROJECT_HOME $GIT_PATH
-   - ./build_image.sh
-
-script: $PROJECT_HOME/tests/testTravisCI.sh  -verbose
+smalltalk:
+  - Pharo-5.0
+  - Squeak-4.5
+  - GemStone-3.3.0
 
+cache:
+  directories:
+    - $SMALLTALK_CI_CACHE
diff --git a/.travis.yml.new b/.travis.yml.new
index 7f4df8be0..5ee0fe851 100644
--- a/.travis.yml.new
+++ b/.travis.yml.new
@@ -4,6 +4,14 @@ sudo: false
 os:
   - linux
 
+smalltalk_edge:
+  source: hpi-swa/smalltalkCI
+  branch: dkh-1
+
+smalltalk_config:
+  - .smalltalkA.ston
+  - .smalltalkB.ston
+
 smalltalk:
   - Pharo-5.0
   - Squeak-4.5
diff --git a/.travis.yml.old b/.travis.yml.old
new file mode 100644
index 000000000..ba682618d
--- /dev/null
+++ b/.travis.yml.old
@@ -0,0 +1,110 @@
+language: erlang
+
+sudo: required
+
+notifications:
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/47796c01bb932d6a0300 # dalehenrich/chat
+      - https://webhooks.gitter.im/e/d6dd211bd92050b46647 # metacello-work chat
+    on_success: always  # options: [always|never|change] default: always
+    on_failure: always  # options: [always|never|change] default: always
+    on_start: false     # default: false
+
+env:
+# Tested platforms and versions:
+#
+# GemStone
+#  GemStone-2.4.x
+#  GemStone-3.1.x
+#  GemStone-3.2.x
+#
+# Pharo
+#  Pharo-1.4
+#  Pharo-2.0
+#  Pharo-3.0 
+#  Pharo-4.0 
+#  Pharo-5.0 
+#
+# Squeak
+#  Squeak-4.3 (not all tests are passing)
+#  Squeak-4.4
+#  Squeak-4.5
+#  Squeak-Trunk
+
+   - ST=Pharo-4.0 LoadList="'default'" TRAVIS_SCRIPT=userGuide.st     # use Pharo4.0 here until https://github.com/dalehenrich/metacello-work/issues/360 is fixed
+   - ST=GemStone-3.3.0 LoadList="'default'" TRAVIS_SCRIPT=userGuide.st
+
+#   - ST=Pharo-5.0 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
+#   - ST=Pharo-5.0 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
+   - ST=GemStone-3.3.0 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
+   - ST=GemStone-3.3.0 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
+   - ST=Squeak-4.5 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st 
+   - ST=Squeak-4.5 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st 
+
+#   - ST=PharoCore-1.1 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
+#   - ST=PharoCore-1.1 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
+#   - ST=PharoCore-1.2 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
+#   - ST=PharoCore-1.2 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
+#   - ST=PharoCore-1.3 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
+#   - ST=PharoCore-1.3 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
+   - ST=Pharo-1.4 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
+   - ST=Pharo-1.4 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
+   - ST=Pharo-2.0 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
+   - ST=Pharo-2.0 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
+   - ST=Pharo-3.0 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st 
+   - ST=Pharo-3.0 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st 
+   - ST=Pharo-4.0 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
+   - ST=Pharo-4.0 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
+#   - ST=Squeak-4.3 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
+#   - ST=Squeak-4.3 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
+   - ST=Squeak-4.4 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
+   - ST=Squeak-4.4 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
+   - ST=Squeak-4.6 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
+   - ST=Squeak-4.6 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
+   - ST=Squeak-5.0 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
+   - ST=Squeak-5.0 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
+
+   - ST=Squeak-Trunk LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
+   - ST=Squeak-Trunk LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
+
+   - ST=GemStone-2.4.4.1 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
+   - ST=GemStone-2.4.4.1 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
+#   - ST=GemStone-2.4.4.8 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
+#   - ST=GemStone-2.4.4.8 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
+#   - ST=GemStone-2.4.5 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
+#   - ST=GemStone-2.4.5 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
+   - ST=GemStone-2.4.5.3 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
+   - ST=GemStone-2.4.5.3 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
+#   - ST=GemStone-2.4.6 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st # https://github.com/dalehenrich/metacello-work/issues/312
+#   - ST=GemStone-2.4.6 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st # https://github.com/dalehenrich/metacello-work/issues/312
+#   - ST=GemStone-3.0.1 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
+#   - ST=GemStone-3.0.1 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
+   - ST=GemStone-3.1.0.6 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
+   - ST=GemStone-3.1.0.6 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
+   - ST=GemStone-3.2.14 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
+   - ST=GemStone-3.2.14 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
+
+matrix:
+   allow_failures:
+   - env: ST=Squeak-4.4 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
+   - env: ST=Squeak-4.4 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
+   - env: ST=Squeak-4.5 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
+   - env: ST=Squeak-Trunk LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
+   - env: ST=Squeak-Trunk LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
+   - env: ST=Squeak-4.6 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
+   - env: ST=Squeak-5.0 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
+
+
+install:
+   - export PROJECT_HOME="$(pwd)"
+   - cd $HOME
+   - wget -q -O builderCI.zip https://github.com/dalehenrich/builderCI/zipball/master
+   - unzip -q builderCI.zip
+   - cd dalehenrich-builderCI*
+   - source build_env_vars
+   - ln -s $PROJECT_HOME $GIT_PATH
+   - ./build_image.sh
+
+script: $PROJECT_HOME/tests/testTravisCI.sh  -verbose
+