Merge branch 'release/0.4.0-rc1'

* release/0.4.0-rc1: (163 commits)
  bump version
  ignores
  expand pypi classifiers
  update api doc for split traceback and logging compat
  using readthedocs
  be consitent using explicit relative imports
  fix bug in fixed print_width option
  unwanted
  renaming xtraceback.tests to xtraceback.test
  excluding a jython test that fails on travis
  unwanted
  full support for python 3
  linted
  don't need rope in git
  latest makeenv
  correct subst call in jython SHELLOPTS
  latest makeenv
  latest makeenv
  travis has dropped py31 and added py33
  peg stacked version
  ...
point to master branch on travis
install py25 from deadsnakes ppa since no longer in travis env
Merge branch 'master' into develop

* master:
  install py25 from deadsnakes ppa since no longer in travis env
  point to master branch on travis

Conflicts:
	README.md