no longer need 3 suffix on travis, tox

.travis.yml

@@ -1,19 +1,18 b''
 # http://travis-ci.org/#!/ipython/ipython
 language: python
 python:
     - 2.7
     - 3.3
 before_install:
     # workaround for https://github.com/travis-ci/travis-cookbooks/issues/155
     - sudo rm -rf /dev/shm && sudo ln -s /run/shm /dev/shm
     - easy_install -q pyzmq
     - pip install jinja2 sphinx pygments tornado requests
     # Pierre Carrier's PPA for PhantomJS and CasperJS
     - sudo add-apt-repository -y ppa:pcarrier/ppa
     - sudo apt-get update
     - sudo apt-get install pandoc casperjs
 install:
     - python setup.py install -q 
 script:
-    - if [[ $TRAVIS_PYTHON_VERSION == '2.'* ]]; then cd /tmp; iptest; fi
-    - if [[ $TRAVIS_PYTHON_VERSION == '3.'* ]]; then cd /tmp; iptest3; fi
+    - cd /tmp && iptest

tox.ini

@@ -1,29 +1,24 b''
 # Tox (http://tox.testrun.org/) is a tool for running tests
 # in multiple virtualenvs. This configuration file will run the
 # test suite on all supported python versions. To use it, "pip install tox"
 # and then run "tox" from this directory.
 
 [tox]
 envlist = py27, py33
 
 [testenv]
 deps = 
   nose
   tornado
   jinja2
   sphinx
   pygments
 # To avoid loading IPython module in the current directory, change
 # current directory to ".tox/py*/tmp" before running test.
 changedir = {envtmpdir}
 
 commands =
     # As pip does not treat egg, use easy_install to install PyZMQ.
     # See also: https://github.com/zeromq/pyzmq
     easy_install -q pyzmq
     iptest --all
-
-[testenv:py33]
-commands =
-    easy_install -q pyzmq
-    iptest3 --all