Merge branch 'master' of https://github.com/burnpanck/traits into python3

Conflicts:
	.travis.yml
Merge branch 'python3' of https://github.com/burnpanck/traits into python3