Adding Python 2.6, 2.7 to travis.yml
Merge branch 'master' into jeff-ben
fixed dat file format for spaceships, and edited