converted to python 3
merged upstream master
Merge branch 'adaption' into python3
Merge branch 'master' into python3
Merge branch 'master' into python3
Merge branch 'python3' of https://github.com/burnpanck/pyface into python3
Add Travis integration for Python 2.7 and 3.3