Better classification in setup.py
Merge branch 'master' into feature/python34

Conflicts:
	.travis.yml
	setup.py