fixed a total noob error i made forgetting to convert python string to int before testing for existance in an array.
incremental commit after large code changes
Left out a file in previous commit.
Merge remote branch 'upstream/master'
port modification to remove conflicts so Jamie can run bin/test_driver -b
Merge remote branch 'upstream/master'
Incremental save of files.
Incremental update