Merge pull request #3 from lukpueh/issue#2

Fixes Issue#2, various comments and fixes from other issues

.travis.yml

@@ -1,6 +1,7 @@
 # Travis integration file.
-# Seattle supports Python 2.5 through 2.7, per
-#   seattle.poly.edu/wiki/ProgrammersPage
+# Seattle supports Python 2.6 through 2.7, per
+# github.com/SeattleTestbed/docs/blob/master/Contributing/BuildInstructions.md
+# Python 2.5 is included for testing because this is what PlanetLab runs
 #
 # Travis provides OS X and Linux (specifically Ubuntu) OS instances.
 # The result of this configuration will be five separate builds on
@@ -65,7 +66,7 @@ matrix:
     # recipe.
     - language: generic
       os: osx
-      env: Python='2.6.9' PythonBin="/Users/travis/.pyenv/versions/2.6.9/bin/python"
+      env: Python='2.6.9' PythonBin="/Users/travis/.pyenv/versions/2.6.9/bin/python" TERM='linux'
       install:
         #brew update;
         #brew install python26; # This is no longer available.

appveyor.yml

@@ -1,4 +1,7 @@
-# Seattle supports Python 2.5 through 2.7, per https://seattle.poly.edu/wiki/ProgrammersPage
+# Seattle supports Python 2.6 through 2.7, per
+# github.com/SeattleTestbed/docs/blob/master/Contributing/BuildInstructions.md
+# Python 2.5 is included for testing because this is what PlanetLab runs
+#
 # AppVeyor provides Windows-based testing.
 # On Windows, we currently test on Python 2.6 and 2.7.
 # The result of the current configuration should be 4 runs:
@@ -40,16 +43,17 @@ platform:
 
 # These are the commands we'll run for each build, posting the python
 # version we're *really* running, initializing to obtain needed common
-# seattle projects, building the current seattle project, and running
-# the seattle unit testing framework, with all tests.
-test_script:
+# seattle projects, building the current seattle project, and ...
+build_script:
   - "%PYTHON%\\python --version"
   - "cd scripts"
   - "%PYTHON%\\python initialize.py"
   - "%PYTHON%\\python build.py -t"
+
+# ... running the seattle unit testing framework, with all tests.
+test_script:
   - "cd ../RUNNABLE"
   - "%PYTHON%\\python utf.py -a"
 
-
 skip_commits:
   message: /(Update README*|Created.*\.(png|jpg|jpeg|bmp|gif))/